From: Christian Van Wambeke Date: Thu, 12 Jun 2014 13:37:23 +0000 (+0200) Subject: 20140612_1537 clone to HYBRIDPLUGIN Modify files contents [('GHS3DPLUGIN', 'HYBRIDPLU... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1c64c894ac2db901a95bc3496fee49efddc65976;p=plugins%2Fghs3dplugin.git 20140612_1537 clone to HYBRIDPLUGIN Modify files contents [('GHS3DPLUGIN', 'HYBRIDPLUGIN'), ('GHS3DPlugin', 'HYBRIDPlugin'), ('GHS3D', 'HYBRID'), ('Ghs3d', 'Hybrid'), ('ghs3d', 'hybrid')] --- diff --git a/CMakeLists.txt b/CMakeLists.txt index d94b361..45e3786 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) -PROJECT(SalomeGHS3DPLUGIN C CXX) +PROJECT(SalomeHYBRIDPLUGIN C CXX) # Ensure a proper linker behavior: CMAKE_POLICY(SET CMP0003 NEW) @@ -46,7 +46,7 @@ ELSE(EXISTS ${KERNEL_ROOT_DIR}) ENDIF(EXISTS ${KERNEL_ROOT_DIR}) IF(SALOME_LIGHT_ONLY) - MESSAGE(FATAL_ERROR "GHS3DPLUGIN module can't be built in Light mode (without CORBA)") + MESSAGE(FATAL_ERROR "HYBRIDPLUGIN module can't be built in Light mode (without CORBA)") ENDIF() # Platform setup @@ -60,7 +60,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") # User options # ============ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) -OPTION(SALOME_BUILD_DOC "Generate SALOME GHS3DPLUGIN documentation" ON) +OPTION(SALOME_BUILD_DOC "Generate SALOME HYBRIDPLUGIN documentation" ON) IF(SALOME_BUILD_TESTS) ENABLE_TESTING() @@ -143,8 +143,8 @@ IF(EXISTS ${SMESH_ROOT_DIR}) ENDIF(SALOME_BUILD_GUI) IF(SALOME_BUILD_DOC) IF(NOT SALOME_SMESH_BUILD_DOC) - MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH documentation to build GHS3DPLUGIN documentation. " - "So, you should either set SALOME_BUILD_DOC=OFF in GHS3DPLUGIN or set SALOME_BUILD_DOC=ON in SMESH module.") + MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH documentation to build HYBRIDPLUGIN documentation. " + "So, you should either set SALOME_BUILD_DOC=OFF in HYBRIDPLUGIN or set SALOME_BUILD_DOC=ON in SMESH module.") ENDIF(NOT SALOME_SMESH_BUILD_DOC) ENDIF(SALOME_BUILD_DOC) ELSE(EXISTS ${SMESH_ROOT_DIR}) @@ -181,18 +181,18 @@ SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") -# Specific to GHS3DPLUGIN: -SET(SALOME_GHS3DPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/ghs3dplugin" CACHE PATH - "Install path: SALOME GHS3DPLUGIN specific data") +# Specific to HYBRIDPLUGIN: +SET(SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/hybridplugin" CACHE PATH + "Install path: SALOME HYBRIDPLUGIN specific data") MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) -MARK_AS_ADVANCED(SALOME_GHS3DPLUGIN_INSTALL_RES_DATA) +MARK_AS_ADVANCED(SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA) -# Accumulate environment variables for GHS3DPLUGIN module +# Accumulate environment variables for HYBRIDPLUGIN module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) @@ -211,7 +211,7 @@ ENDIF(SALOME_BUILD_DOC) # Header configuration # ==================== SALOME_XVERSION(${PROJECT_NAME}) -SALOME_CONFIGURE_FILE(GHS3DPLUGIN_version.h.in GHS3DPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS}) +SALOME_CONFIGURE_FILE(HYBRIDPLUGIN_version.h.in HYBRIDPLUGIN_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export # (here only the level 1 prerequisites are exposed) @@ -221,12 +221,12 @@ INCLUDE(CMakePackageConfigHelpers) # List of targets in this project we want to make visible to the rest of the world. # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" SET(_${PROJECT_NAME}_exposed_targets - GHS3DEngine SalomeIDLGHS3DPLUGIN + HYBRIDEngine SalomeIDLHYBRIDPLUGIN ) IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets - GHS3DPluginGUI + HYBRIDPluginGUI ) ENDIF(SALOME_BUILD_GUI) diff --git a/HYBRIDPLUGIN_version.h.in b/HYBRIDPLUGIN_version.h.in index b36b651..7ca46bf 100644 --- a/HYBRIDPLUGIN_version.h.in +++ b/HYBRIDPLUGIN_version.h.in @@ -17,29 +17,29 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : GHS3DPLUGIN_version.h +// File : HYBRIDPLUGIN_version.h // Author : Vadim SANDLER // Module : SALOME // -#if !defined(__GHS3DPLUGIN_VERSION_H__) -#define __GHS3DPLUGIN_VERSION_H__ +#if !defined(__HYBRIDPLUGIN_VERSION_H__) +#define __HYBRIDPLUGIN_VERSION_H__ /*! - Specify version of SALOME GHS3DPLUGIN module, as follows + Specify version of SALOME HYBRIDPLUGIN module, as follows - GHS3DPLUGIN_VERSION_MAJOR : (integer) number identifying major version - GHS3DPLUGIN_VERSION_MINOR : (integer) number identifying minor version - GHS3DPLUGIN_VERSION_MAINTENANCE : (integer) number identifying maintenance version - GHS3DPLUGIN_VERSION_STR : (string) complete version number "major.minor.maintenance" - GHS3DPLUGIN_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance - GHS3DPLUGIN_DEVELOPMENT : (integer) indicates development version when set to 1 + HYBRIDPLUGIN_VERSION_MAJOR : (integer) number identifying major version + HYBRIDPLUGIN_VERSION_MINOR : (integer) number identifying minor version + HYBRIDPLUGIN_VERSION_MAINTENANCE : (integer) number identifying maintenance version + HYBRIDPLUGIN_VERSION_STR : (string) complete version number "major.minor.maintenance" + HYBRIDPLUGIN_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + HYBRIDPLUGIN_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define GHS3DPLUGIN_VERSION_MAJOR @SALOMEGHS3DPLUGIN_MAJOR_VERSION@ -#define GHS3DPLUGIN_VERSION_MINOR @SALOMEGHS3DPLUGIN_MINOR_VERSION@ -#define GHS3DPLUGIN_VERSION_MAINTENANCE @SALOMEGHS3DPLUGIN_PATCH_VERSION@ -#define GHS3DPLUGIN_VERSION_STR "@SALOMEGHS3DPLUGIN_VERSION@" -#define GHS3DPLUGIN_VERSION @SALOMEGHS3DPLUGIN_XVERSION@ -#define GHS3DPLUGIN_DEVELOPMENT @SALOMEGHS3DPLUGIN_VERSION_DEV@ +#define HYBRIDPLUGIN_VERSION_MAJOR @SALOMEHYBRIDPLUGIN_MAJOR_VERSION@ +#define HYBRIDPLUGIN_VERSION_MINOR @SALOMEHYBRIDPLUGIN_MINOR_VERSION@ +#define HYBRIDPLUGIN_VERSION_MAINTENANCE @SALOMEHYBRIDPLUGIN_PATCH_VERSION@ +#define HYBRIDPLUGIN_VERSION_STR "@SALOMEHYBRIDPLUGIN_VERSION@" +#define HYBRIDPLUGIN_VERSION @SALOMEHYBRIDPLUGIN_XVERSION@ +#define HYBRIDPLUGIN_DEVELOPMENT @SALOMEHYBRIDPLUGIN_VERSION_DEV@ -#endif // __GHS3DPLUGIN_VERSION_H__ +#endif // __HYBRIDPLUGIN_VERSION_H__ diff --git a/INSTALL b/INSTALL index 937a961..837878e 100644 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -SALOME2 : GHS3DPLUGIN module (SMESH plugin) +SALOME2 : HYBRIDPLUGIN module (SMESH plugin) diff --git a/SalomeHYBRIDPLUGINConfig.cmake.in b/SalomeHYBRIDPLUGINConfig.cmake.in index ffe8291..8fdd4dc 100644 --- a/SalomeHYBRIDPLUGINConfig.cmake.in +++ b/SalomeHYBRIDPLUGINConfig.cmake.in @@ -34,29 +34,29 @@ # Load the dependencies for the libraries of @PROJECT_NAME@ # (contains definitions for IMPORTED targets). This is only # imported if we are not built as a subproject (in this case targets are already there) -IF(NOT TARGET GHS3DEngine AND NOT @PROJECT_NAME@_BINARY_DIR) +IF(NOT TARGET HYBRIDEngine AND NOT @PROJECT_NAME@_BINARY_DIR) INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") ENDIF() # Package root dir: -SET_AND_CHECK(GHS3DPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") +SET_AND_CHECK(HYBRIDPLUGIN_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") # Include directories -SET_AND_CHECK(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") -SET(GHS3DPLUGIN_INCLUDE_DIRS "${GHS3DPLUGIN_INCLUDE_DIRS};@_SalomeGHS3DPLUGIN_EXTRA_HEADERS@") -SET(GHS3DPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") +SET_AND_CHECK(HYBRIDPLUGIN_INCLUDE_DIRS "${HYBRIDPLUGIN_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") +SET(HYBRIDPLUGIN_INCLUDE_DIRS "${HYBRIDPLUGIN_INCLUDE_DIRS};@_SalomeHYBRIDPLUGIN_EXTRA_HEADERS@") +SET(HYBRIDPLUGIN_DEFINITIONS "@SMESH_DEFINITIONS@") # Package specific environment variables -@_SalomeGHS3DPLUGIN_EXTRA_ENV_FULL@ +@_SalomeHYBRIDPLUGIN_EXTRA_ENV_FULL@ #### Now the specificities # Options exported by the package: -SET(SALOME_GHS3DPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) -SET(SALOME_GHS3DPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) +SET(SALOME_HYBRIDPLUGIN_BUILD_TESTS @SALOME_BUILD_TESTS@) +SET(SALOME_HYBRIDPLUGIN_BUILD_DOC @SALOME_BUILD_DOC@) # Advanced options -SET(SALOME_GHS3DPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@) +SET(SALOME_HYBRIDPLUGIN_BUILD_GUI @SALOME_BUILD_GUI@) # Level 1 prerequisites: SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_SMESH_ROOT_DIR@") @@ -113,7 +113,7 @@ IF(NOT (TARGET SMESHEngine)) INCLUDE("${SMESH_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE}/SalomeSMESHTargets.cmake") ENDIF() -# Exposed GHS3DPLUGIN targets: -SET(GHS3DPLUGIN_GHS3DEngine GHS3DEngine) -SET(GHS3DPLUGIN_GHS3DPluginGUI GHS3DPluginGUI) -SET(GHS3DPLUGIN_SalomeIDLGHS3DPLUGIN SalomeIDLGHS3DPLUGIN) \ No newline at end of file +# Exposed HYBRIDPLUGIN targets: +SET(HYBRIDPLUGIN_HYBRIDEngine HYBRIDEngine) +SET(HYBRIDPLUGIN_HYBRIDPluginGUI HYBRIDPluginGUI) +SET(HYBRIDPLUGIN_SalomeIDLHYBRIDPLUGIN SalomeIDLHYBRIDPLUGIN) \ No newline at end of file diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index f2c96fb..6d726fd 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -23,6 +23,6 @@ # These files are data, module or lib files SET(_adm_data - FindSalomeGHS3DPLUGIN.cmake + FindSalomeHYBRIDPLUGIN.cmake ) INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake index 1a3bd9f..cde4e8c 100644 --- a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake @@ -18,18 +18,18 @@ # # -IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Looking for Salome GHS3DPLUGIN ...") +IF(NOT SalomeHYBRIDPLUGIN_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome HYBRIDPLUGIN ...") ENDIF() -SET(CMAKE_PREFIX_PATH "${GHS3DPLUGIN_ROOT_DIR}") +SET(CMAKE_PREFIX_PATH "${HYBRIDPLUGIN_ROOT_DIR}") -SALOME_FIND_PACKAGE(SalomeGHS3DPLUGIN SalomeGHS3DPLUGIN CONFIG) +SALOME_FIND_PACKAGE(SalomeHYBRIDPLUGIN SalomeHYBRIDPLUGIN CONFIG) -IF(NOT SalomeGHS3DPLUGIN_FIND_QUIETLY) - MESSAGE(STATUS "Found Salome GHS3DPLUGIN: ${GHS3DPLUGIN_ROOT_DIR}") +IF(NOT SalomeHYBRIDPLUGIN_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome HYBRIDPLUGIN: ${HYBRIDPLUGIN_ROOT_DIR}") ENDIF() -FOREACH(_res ${SalomeGHS3DPLUGIN_EXTRA_ENV}) - SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeGHS3DPLUGIN_EXTRA_ENV_${_res}}") +FOREACH(_res ${SalomeHYBRIDPLUGIN_EXTRA_ENV}) + SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHYBRIDPLUGIN_EXTRA_ENV_${_res}}") ENDFOREACH() \ No newline at end of file diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt index 7bcc8c8..2e06ad0 100755 --- a/adm_local/unix/config_files/CMakeLists.txt +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -21,8 +21,8 @@ # SET(_m4_data - check_GHS3D.m4 - check_GHS3DPLUGIN.m4 + check_HYBRID.m4 + check_HYBRIDPLUGIN.m4 ) INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/config_files/check_HYBRID.m4 b/adm_local/unix/config_files/check_HYBRID.m4 index 9224772..aa2159a 100644 --- a/adm_local/unix/config_files/check_HYBRID.m4 +++ b/adm_local/unix/config_files/check_HYBRID.m4 @@ -17,19 +17,19 @@ dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl -AC_DEFUN([CHECK_GHS3D],[ +AC_DEFUN([CHECK_HYBRID],[ -GHS3D_ok=no +HYBRID_ok=no AC_EXEEXT -AC_CHECK_PROG(GHS3D, ghs3d$EXEEXT,found) +AC_CHECK_PROG(HYBRID, hybrid$EXEEXT,found) -if test "x$GHS3D" == x ; then - AC_MSG_WARN(ghs3d program not found in PATH variable) +if test "x$HYBRID" == x ; then + AC_MSG_WARN(hybrid program not found in PATH variable) else - GHS3D_ok=yes + HYBRID_ok=yes fi -AC_MSG_RESULT(for GHS3D: $GHS3D_ok) +AC_MSG_RESULT(for HYBRID: $HYBRID_ok) ])dnl diff --git a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 index dbee352..05a0572 100755 --- a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 @@ -17,62 +17,62 @@ dnl dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl -# Check availability of GHS3DPLUGIN binary distribution +# Check availability of HYBRIDPLUGIN binary distribution # # Author : Marc Tajchman (CEA, 2002) #------------------------------------------------------------ -AC_DEFUN([CHECK_GHS3DPLUGIN],[ +AC_DEFUN([CHECK_HYBRIDPLUGIN],[ -GHS3DPLUGIN_LDFLAGS="" -GHS3DPLUGIN_CXXFLAGS="" +HYBRIDPLUGIN_LDFLAGS="" +HYBRIDPLUGIN_CXXFLAGS="" AC_CHECKING(for GHS3dPlugin) GHS3dPlugin_ok=no AC_ARG_WITH(ghs, - --with-ghs3dPlugin=DIR root directory path of GHS3DPLUGIN build or installation, - GHS3DPLUGIN_DIR="$withval",GHS3DPLUGIN_DIR="") + --with-hybridPlugin=DIR root directory path of HYBRIDPLUGIN build or installation, + HYBRIDPLUGIN_DIR="$withval",HYBRIDPLUGIN_DIR="") -if test "x$GHS3DPLUGIN_DIR" = "x" ; then +if test "x$HYBRIDPLUGIN_DIR" = "x" ; then # no --with-gui-dir option used - if test "x$GHS3DPLUGIN_ROOT_DIR" != "x" ; then + if test "x$HYBRIDPLUGIN_ROOT_DIR" != "x" ; then # SALOME_ROOT_DIR environment variable defined - GHS3DPLUGIN_DIR=$GHS3DPLUGIN_ROOT_DIR + HYBRIDPLUGIN_DIR=$HYBRIDPLUGIN_ROOT_DIR else # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libGHS3DEngine.so) + AC_PATH_PROG(TEMP, libHYBRIDEngine.so) if test "x$TEMP" != "x" ; then - GHS3DPLUGIN_DIR=`dirname $TEMP` + HYBRIDPLUGIN_DIR=`dirname $TEMP` fi fi fi -if test -f ${GHS3DPLUGIN_DIR}/lib/salome/libGHS3DEngine.so ; then +if test -f ${HYBRIDPLUGIN_DIR}/lib/salome/libHYBRIDEngine.so ; then GHS3dPlugin_ok=yes - AC_MSG_RESULT(Using GHS3DPLUGIN module distribution in ${GHS3DPLUGIN_DIR}) + AC_MSG_RESULT(Using HYBRIDPLUGIN module distribution in ${HYBRIDPLUGIN_DIR}) - if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then - GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR} + if test "x$HYBRIDPLUGIN_ROOT_DIR" == "x" ; then + HYBRIDPLUGIN_ROOT_DIR=${HYBRIDPLUGIN_DIR} fi - GHS3DPLUGIN_CXXFLAGS+=-I${GHS3DPLUGIN_ROOT_DIR}/include/salome - GHS3DPLUGIN_LDFLAGS+=-L${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - AC_SUBST(GHS3DPLUGIN_ROOT_DIR) - AC_SUBST(GHS3DPLUGIN_LDFLAGS) - AC_SUBST(GHS3DPLUGIN_CXXFLAGS) + HYBRIDPLUGIN_CXXFLAGS+=-I${HYBRIDPLUGIN_ROOT_DIR}/include/salome + HYBRIDPLUGIN_LDFLAGS+=-L${HYBRIDPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + AC_SUBST(HYBRIDPLUGIN_ROOT_DIR) + AC_SUBST(HYBRIDPLUGIN_LDFLAGS) + AC_SUBST(HYBRIDPLUGIN_CXXFLAGS) else - AC_MSG_WARN("Cannot find compiled GHS3DPLUGIN module distribution") + AC_MSG_WARN("Cannot find compiled HYBRIDPLUGIN module distribution") fi -AC_MSG_RESULT(for GHS3DPLUGIN: $GHS3dPlugin_ok) +AC_MSG_RESULT(for HYBRIDPLUGIN: $GHS3dPlugin_ok) ])dnl diff --git a/bin/VERSION.in b/bin/VERSION.in index 0cc3deb..4fe439a 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME GHS3DPLUGIN] : @SALOMEGHS3DPLUGIN_VERSION@ -[DEVELOPMENT] : @SALOMEGHS3DPLUGIN_VERSION_DEV@ +[SALOME HYBRIDPLUGIN] : @SALOMEHYBRIDPLUGIN_VERSION@ +[DEVELOPMENT] : @SALOMEHYBRIDPLUGIN_VERSION_DEV@ [DESCRIPTION] : DISTENE TetGen-GHS3d meshing plug-in for SALOME Mesh module diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 500aed4..0fadb32 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -18,4 +18,4 @@ # FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.py") -INSTALL(FILES ${files} DESTINATION ${SALOME_INSTALL_DOC}/examples/GHS3DPLUGIN) +INSTALL(FILES ${files} DESTINATION ${SALOME_INSTALL_DOC}/examples/HYBRIDPLUGIN) diff --git a/doc/salome/examples/hybrid_enfmesh.py b/doc/salome/examples/hybrid_enfmesh.py index 4da517e..80bf527 100644 --- a/doc/salome/examples/hybrid_enfmesh.py +++ b/doc/salome/examples/hybrid_enfmesh.py @@ -1,5 +1,5 @@ -# It is possible to constrain GHS3D with another mesh or group. +# It is possible to constrain HYBRID with another mesh or group. # The constraint can refer to the nodes, edges or faces. # This feature is available only on 2D meshes without geometry. # The constraining elements are called enforced elements for the mesh. @@ -44,15 +44,15 @@ BLSURF_Parameters2 = smesh.CreateHypothesis('BLSURF_Parameters', 'BLSURFEngine') BLSURF_Parameters2.SetGeometricMesh( 1 ) # Create the 3D algorithm and hypothesis -GHS3D = smesh.CreateHypothesis('GHS3D_3D', 'GHS3DEngine') -GHS3D_Parameters_node = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -#GHS3D_Parameters_node.SetToMeshHoles( 1 ) -GHS3D_Parameters_edge = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -#GHS3D_Parameters_edge.SetToMeshHoles( 1 ) -GHS3D_Parameters_face = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -GHS3D_Parameters_face.SetToMeshHoles( 1 ) # to mesh inside the cylinder -GHS3D_Parameters_mesh = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -GHS3D_Parameters_mesh.SetToMeshHoles( 1 ) # to mesh inside the cylinder +HYBRID = smesh.CreateHypothesis('HYBRID_3D', 'HYBRIDEngine') +HYBRID_Parameters_node = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +#HYBRID_Parameters_node.SetToMeshHoles( 1 ) +HYBRID_Parameters_edge = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +#HYBRID_Parameters_edge.SetToMeshHoles( 1 ) +HYBRID_Parameters_face = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +HYBRID_Parameters_face.SetToMeshHoles( 1 ) # to mesh inside the cylinder +HYBRID_Parameters_mesh = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +HYBRID_Parameters_mesh.SetToMeshHoles( 1 ) # to mesh inside the cylinder # Create the mesh on the cylinder Mesh_cylindre = smesh.Mesh(cylindre) @@ -77,26 +77,26 @@ Mesh_box_tri.Compute() # Then the 3D algo and hypothesis are assigned to them. mesh_mesh = smesh.CopyMesh( Mesh_box_tri, 'Enforced by faces of mesh', 0, 0) -mesh_mesh.AddHypothesis( GHS3D ) -mesh_mesh.AddHypothesis( GHS3D_Parameters_mesh) +mesh_mesh.AddHypothesis( HYBRID ) +mesh_mesh.AddHypothesis( HYBRID_Parameters_mesh) mesh_node = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of nodes', 0, 0) -mesh_node.AddHypothesis( GHS3D ) -mesh_node.AddHypothesis( GHS3D_Parameters_node) +mesh_node.AddHypothesis( HYBRID ) +mesh_node.AddHypothesis( HYBRID_Parameters_node) mesh_edge = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of edges', 0, 0) -mesh_edge.AddHypothesis( GHS3D ) -mesh_edge.AddHypothesis( GHS3D_Parameters_edge) +mesh_edge.AddHypothesis( HYBRID ) +mesh_edge.AddHypothesis( HYBRID_Parameters_edge) mesh_face = smesh.CopyMesh( Mesh_box_tri, 'Enforced by group of faces', 0, 0) -mesh_face.AddHypothesis( GHS3D ) -mesh_face.AddHypothesis( GHS3D_Parameters_face) +mesh_face.AddHypothesis( HYBRID ) +mesh_face.AddHypothesis( HYBRID_Parameters_face) # Add the enforced elements -GHS3D_Parameters_mesh.SetEnforcedMeshWithGroup(Mesh_cylindre.GetMesh(),SMESH.FACE,"faces from cylinder") -GHS3D_Parameters_node.SetEnforcedMeshWithGroup(face_cyl_nodes,SMESH.NODE,"nodes from face_cyl_nodes") -GHS3D_Parameters_edge.SetEnforcedMeshWithGroup(face_cyl_edges,SMESH.EDGE,"edges from face_cyl_edges") -GHS3D_Parameters_face.SetEnforcedMeshWithGroup(face_cyl_faces,SMESH.FACE,"faces from face_cyl_faces") +HYBRID_Parameters_mesh.SetEnforcedMeshWithGroup(Mesh_cylindre.GetMesh(),SMESH.FACE,"faces from cylinder") +HYBRID_Parameters_node.SetEnforcedMeshWithGroup(face_cyl_nodes,SMESH.NODE,"nodes from face_cyl_nodes") +HYBRID_Parameters_edge.SetEnforcedMeshWithGroup(face_cyl_edges,SMESH.EDGE,"edges from face_cyl_edges") +HYBRID_Parameters_face.SetEnforcedMeshWithGroup(face_cyl_faces,SMESH.FACE,"faces from face_cyl_faces") #Compute the meshes mesh_node.Compute() diff --git a/doc/salome/examples/hybrid_enfvert.py b/doc/salome/examples/hybrid_enfvert.py index 319ca32..0c04248 100644 --- a/doc/salome/examples/hybrid_enfvert.py +++ b/doc/salome/examples/hybrid_enfvert.py @@ -25,44 +25,44 @@ smesh = smeshBuilder.New(salome.myStudy) box = geompy.MakeBoxDXDYDZ(200., 200., 200.) geompy.addToStudy(box, "box") # create a mesh on the box -ghs3dMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") +hybridMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") # create a BLSurf algorithm for faces -ghs3dMesh.Triangle(algo=smeshBuilder.BLSURF) +hybridMesh.Triangle(algo=smeshBuilder.BLSURF) # compute the mesh -ghs3dMesh.Compute() +hybridMesh.Compute() # Make a copy of the 2D mesh -ghs3dMesh_wo_geometry = smesh.CopyMesh( ghs3dMesh, 'Ghs3D wo geometry', 0, 0) +hybridMesh_wo_geometry = smesh.CopyMesh( hybridMesh, 'Ghs3D wo geometry', 0, 0) # create a Ghs3D algorithm and hypothesis and assign them to the mesh -GHS3D = smesh.CreateHypothesis('GHS3D_3D', 'GHS3DEngine') -GHS3D_Parameters = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -ghs3dMesh.AddHypothesis( GHS3D ) -ghs3dMesh.AddHypothesis( GHS3D_Parameters ) +HYBRID = smesh.CreateHypothesis('HYBRID_3D', 'HYBRIDEngine') +HYBRID_Parameters = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +hybridMesh.AddHypothesis( HYBRID ) +hybridMesh.AddHypothesis( HYBRID_Parameters ) # Create the enforced vertex -GHS3D_Parameters.SetEnforcedVertex( 50, 50, 100, 2) # no group +HYBRID_Parameters.SetEnforcedVertex( 50, 50, 100, 2) # no group # Compute the mesh -ghs3dMesh.Compute() +hybridMesh.Compute() # Ex2: Add one vertex enforced by a GEOM vertex at (50,50,100) # with physical size 5 and add it to a group called "My special nodes" -# Create another GHS3D hypothesis and assign it to the mesh without geometry -GHS3D_Parameters_wo_geometry = smesh.CreateHypothesis('GHS3D_Parameters', 'GHS3DEngine') -ghs3dMesh_wo_geometry.AddHypothesis( GHS3D ) -ghs3dMesh_wo_geometry.AddHypothesis( GHS3D_Parameters_wo_geometry ) +# Create another HYBRID hypothesis and assign it to the mesh without geometry +HYBRID_Parameters_wo_geometry = smesh.CreateHypothesis('HYBRID_Parameters', 'HYBRIDEngine') +hybridMesh_wo_geometry.AddHypothesis( HYBRID ) +hybridMesh_wo_geometry.AddHypothesis( HYBRID_Parameters_wo_geometry ) # Create the enforced vertex p1 = geompy.MakeVertex(150, 150, 100) geompy.addToStudy(p1, "p1") -GHS3D_Parameters_wo_geometry.SetEnforcedVertexGeomWithGroup( p1, 5 , "My special nodes") -#GHS3D_Parameters.SetEnforcedVertexGeom( p1, 5 ) # no group +HYBRID_Parameters_wo_geometry.SetEnforcedVertexGeomWithGroup( p1, 5 , "My special nodes") +#HYBRID_Parameters.SetEnforcedVertexGeom( p1, 5 ) # no group # compute the mesh -ghs3dMesh_wo_geometry.Compute() +hybridMesh_wo_geometry.Compute() # Erase all enforced vertices -GHS3D_Parameters.ClearEnforcedVertices() +HYBRID_Parameters.ClearEnforcedVertices() # End of script diff --git a/doc/salome/examples/hybriddemo.py b/doc/salome/examples/hybriddemo.py index 2e43838..d4b89f7 100644 --- a/doc/salome/examples/hybriddemo.py +++ b/doc/salome/examples/hybriddemo.py @@ -14,14 +14,14 @@ box = geompy.MakeBoxDXDYDZ(200., 200., 200.) geompy.addToStudy(box, "box") # create a mesh on the box -ghs3dMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") +hybridMesh = smesh.Mesh(box,"box: Ghs3D and BLSurf mesh") # create a BLSurf algorithm for faces -BLSURF = ghs3dMesh.Triangle(algo=smeshBuilder.BLSURF) -GHS3D = ghs3dMesh.Tetrahedron(algo=smeshBuilder.GHS3D) +BLSURF = hybridMesh.Triangle(algo=smeshBuilder.BLSURF) +HYBRID = hybridMesh.Tetrahedron(algo=smeshBuilder.HYBRID) # compute the mesh -ghs3dMesh.Compute() +hybridMesh.Compute() # End of script diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index d9493ff..d1667cd 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -20,4 +20,4 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(GHS3DPLUGIN) +ADD_SUBDIRECTORY(HYBRIDPLUGIN) diff --git a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt index b30912c..dbff9d4 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt @@ -22,17 +22,17 @@ SALOME_CONFIGURE_FILE(doxyfile_py.in doxyfile_py) SALOME_CONFIGURE_FILE(static/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header.html) SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header_py.html) -SET(DOC_SMESH_MeshersList GHS3DPlugin) +SET(DOC_SMESH_MeshersList HYBRIDPlugin) SET(smesh_file "$(SMESH_ROOT_DIR)/bin/salome/collect_mesh_methods.py") SET(kernel_file "$ENV{KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") SALOME_ACCUMULATE_ENVIRONMENT(SMESH_MeshersList NOCHECK ${DOC_SMESH_MeshersList}) -SET(_cmd_options ${smesh_file} -d -o tmp/smeshBuilder.py GHS3DPlugin) +SET(_cmd_options ${smesh_file} -d -o tmp/smeshBuilder.py HYBRIDPlugin) SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${PYTHON_EXECUTABLE}" "${_cmd_options}") ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp - COMMAND ${PYTHON_EXECUTABLE} ${kernel_file} -o tmp/GHS3DPluginBuilder.py ${CMAKE_SOURCE_DIR}/src/GHS3DPlugin/GHS3DPluginBuilder.py + COMMAND ${PYTHON_EXECUTABLE} ${kernel_file} -o tmp/HYBRIDPluginBuilder.py ${CMAKE_SOURCE_DIR}/src/HYBRIDPlugin/HYBRIDPluginBuilder.py COMMAND ${PYTHON_EXECUTABLE} ${kernel_file} -o tmp/smesh_algorithm.py ${SMESH_ROOT_DIR}/${SALOME_INSTALL_PYTHON}/salome/smesh/smesh_algorithm.py COMMAND ${_cmd} COMMAND ${DOXYGEN_EXECUTABLE} doxyfile_py @@ -43,9 +43,9 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp ) INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GHS3DPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui/) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GHS3DPLUGIN) -INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/GHS3DPLUGIN/ghs3dpluginpy_doc) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYBRIDPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui/) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYBRIDPLUGIN) +INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYBRIDPLUGIN/hybridpluginpy_doc) -SET(make_clean_files GHS3DPLUGIN ghs3dpluginpy_doc.tag) +SET(make_clean_files HYBRIDPLUGIN hybridpluginpy_doc.tag) SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${make_clean_files}") diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in index 0eaea02..0eda78c 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in @@ -20,8 +20,8 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME GHS3DPLUGIN User's Guide" -OUTPUT_DIRECTORY = GHS3DPLUGIN +PROJECT_NAME = "SALOME HYBRIDPLUGIN User's Guide" +OUTPUT_DIRECTORY = HYBRIDPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -77,10 +77,10 @@ GENERATE_RTF = NO #rnv: 07.04.2011 Workaround for the doxygen 1.7.3: #because it wrongly defines location of the html files for search. -TAGFILES = ghs3dpluginpy_doc.tag=../GHS3DPLUGIN/ghs3dpluginpy_doc +TAGFILES = hybridpluginpy_doc.tag=../HYBRIDPLUGIN/hybridpluginpy_doc SEARCHENGINE = YES #--------------------------------------------------------------------------- #Custom commands #--------------------------------------------------------------------------- -ALIASES += tui_script{1}="\include \1 Download this script" +ALIASES += tui_script{1}="\include \1 Download this script" diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in index 54aafbd..8a96847 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in @@ -20,8 +20,8 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME GHS3DPLUGIN User's Guide" -OUTPUT_DIRECTORY = GHS3DPLUGIN +PROJECT_NAME = "SALOME HYBRIDPLUGIN User's Guide" +OUTPUT_DIRECTORY = HYBRIDPLUGIN CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO @@ -96,7 +96,7 @@ EXAMPLE_RECURSIVE = NO #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = tmp/GHS3DPluginBuilder.py \ +INPUT = tmp/HYBRIDPluginBuilder.py \ tmp/smeshBuilder.py \ tmp/smesh_algorithm.py FILE_PATTERNS = @@ -108,7 +108,7 @@ EXAMPLE_PATH = #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = ghs3dpluginpy_doc +HTML_OUTPUT = hybridpluginpy_doc HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header_py.html HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css @@ -158,5 +158,5 @@ DOT_CLEANUP = YES #--------------------------------------------------------------------------- #External reference options #--------------------------------------------------------------------------- -GENERATE_TAGFILE = ghs3dpluginpy_doc.tag +GENERATE_TAGFILE = hybridpluginpy_doc.tag SEARCHENGINE = YES diff --git a/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc b/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc index 90873f2..6500392 100644 --- a/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc +++ b/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc @@ -5,9 +5,9 @@ \n Additional Hypotheses can be applied as a supplement to the main hypotheses, introducing additional concepts to mesh creation. -One additional hypotheses can be used together with GHS3D algoritm: +One additional hypotheses can be used together with HYBRID algoritm: