From cbffaac293e9aa2ed5cc282ede001a2332fd15ac Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 5 Dec 2011 11:52:38 +0000 Subject: [PATCH] Merge from V6_4_BR 05/12/2011 --- adm_local/cmake_files/FindBLSURF.cmake | 2 ++ adm_local/unix/config_files/check_BLSURF.m4 | 6 +++++- configure.ac | 2 +- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 4 ++++ src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx | 12 ++++++++++++ src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx | 4 +++- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/adm_local/cmake_files/FindBLSURF.cmake b/adm_local/cmake_files/FindBLSURF.cmake index 0e514be..3b9020d 100644 --- a/adm_local/cmake_files/FindBLSURF.cmake +++ b/adm_local/cmake_files/FindBLSURF.cmake @@ -35,10 +35,12 @@ ELSE(WINDOWS) ENDIF(WINDOWS) FIND_LIBRARY(BLSurf BLSurf PATHS ${BLSURF_LIBS_PATHS}) +FIND_LIBRARY(PreCAD PreCAD PATHS ${BLSURF_LIBS_PATHS}) FIND_LIBRARY(distene distene PATHS ${BLSURF_LIBS_PATHS}) SET(BLSURF_LIBS) SET(BLSURF_LIBS ${BLSURF_LIBS} ${BLSurf}) +SET(BLSURF_LIBS ${BLSURF_LIBS} ${PreCAD}) IF(distene) SET(BLSURF_LIBS ${BLSURF_LIBS} ${distene}) ENDIF(distene) diff --git a/adm_local/unix/config_files/check_BLSURF.m4 b/adm_local/unix/config_files/check_BLSURF.m4 index e96e425..cf519a3 100644 --- a/adm_local/unix/config_files/check_BLSURF.m4 +++ b/adm_local/unix/config_files/check_BLSURF.m4 @@ -61,7 +61,11 @@ if test "$with_blsurf" != "no" ; then LOCAL_INCLUDES="-I$BLSURF_HOME/include" LOCAL_LIBS="-L$BLSURF_HOME/lib/Linux" - if test $(`which arch`) = x86_64 ; then + archtest="$(`which arch`)" + if test "x$archtest" = "x" ; then + archtest="`uname -m`" + fi + if test $archtest = "x86_64" ; then LOCAL_LIBS="-L$BLSURF_HOME/lib/Linux_64" fi LOCAL_LIBS="${LOCAL_LIBS} -ldistene -lBLSurf -lPreCAD" diff --git a/configure.ac b/configure.ac index 060099d..000d123 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project BLSURFPLUGIN module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeBLSURFPLUGIN]) +AC_INIT([Salome2 Project BLSURFPLUGIN module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeBLSURFPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 070ce9f..1bb9ecf 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -1781,6 +1781,10 @@ bool BLSURFPlugin_BLSURF::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape) if ( BRep_Tool::Curve(TopoDS::Edge( emap( i )), loc, f,l).IsNull() ) if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( emap( i ))) sm->SetIsAlwaysComputed( true ); + for (int i = 1; i <= pmap.Extent(); i++) + if ( SMESH_subMesh* sm = aMesh.GetSubMeshContaining( pmap( i ))) + if ( !sm->IsMeshComputed() ) + sm->SetIsAlwaysComputed( true ); delete [] nodes; diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx index 4c90a3c..6733fc8 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx @@ -34,6 +34,18 @@ #include #include +#ifdef HAVE_FINITE +#undef HAVE_FINITE // VSR: avoid compilation warning on Linux : "HAVE_FINITE" redefined +#endif +// rnv: avoid compilation warning on Linux : "_POSIX_C_SOURCE" and "_XOPEN_SOURCE" are redefined +#ifdef _POSIX_C_SOURCE +#undef _POSIX_C_SOURCE +#endif + +#ifdef _XOPEN_SOURCE +#undef _XOPEN_SOURCE +#endif + #include #include "SMESH_2D_Algo.hxx" #include "SMESH_Mesh.hxx" diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx index 68990b7..a11636d 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx @@ -87,7 +87,9 @@ BLSURFPlugin_Hypothesis::BLSURFPlugin_Hypothesis(int hypId, int studyId, SMESH_G const char* intOptionNames[] = { "addsurf_ivertex", "background", "CheckAdjacentEdges", "CheckCloseEdges", "CheckWellDefined", "coiter", "communication", "debug", "decim", "export_flag", "file_h", "frontal", "gridnu", "gridnv", "hinterpol_flag", "hmean_flag", "intermedfile", "memory", "normals", "optim", "pardom_flag", "pinch", "refs", - "rigid", "surforient", "tconf", "topo_collapse", "" // mark of end + "rigid", "surforient", "tconf", "topo_collapse", + "proximity", "prox_nb_layer", "prox_ratio", // detects the volumic proximity of surfaces + "" // mark of end }; const char* doubleOptionNames[] = { "addsurf_angle", "addsurf_R", "addsurf_H", "addsurf_FG", "addsurf_r", "addsurf_PA", "angle_compcurv", "angle_ridge", "CoefRectangle", "eps_collapse", "eps_ends", "eps_pardom", "LSS", -- 2.39.2