From 561832d42b0ebdbf0e249c6b273951a54614b9d9 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 6 Mar 2013 13:59:38 +0000 Subject: [PATCH] Merge from V6_main 06/03/2013 --- adm_local/cmake_files/FindCADSURF.cmake | 14 ++++++++------ src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/adm_local/cmake_files/FindCADSURF.cmake b/adm_local/cmake_files/FindCADSURF.cmake index 6822a40..c567a9a 100644 --- a/adm_local/cmake_files/FindCADSURF.cmake +++ b/adm_local/cmake_files/FindCADSURF.cmake @@ -24,14 +24,16 @@ SET(MESHGEMS_CADSURF_INCLUDES ${MESHGEMS_CADSURF_INCLUDES} -I${CADSURF_INCLUDES_ SET(CADSURF_LIBS_PATHS) SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib) + +SET(suff) +IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) + SET(suff "_64") +ENDIF() + IF(WINDOWS) - SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/WinXP_VC9) + SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/WinXP${suff}_VC9) ELSE(WINDOWS) - IF(CMAKE_SIZEOF_VOID_P STREQUAL 8) - SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux_64) - ELSE() - SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux) - ENDIF() + SET(CADSURF_LIBS_PATHS ${CADSURF_LIBS_PATHS} ${MESHGEMSHOME}/lib/Linux${suff}) ENDIF(WINDOWS) FIND_LIBRARY(mg-cadsurf mg-cadsurf PATHS ${CADSURF_LIBS_PATHS}) diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 69a9640..21be167 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -697,7 +697,7 @@ void BLSURFPlugin_BLSURF::SetParameters( const BLSURFPlugin_Hypothesis* hyp, cadsurf_session_t * css, precad_session_t * pcs, - const TopoDS_Shape& GeomShape, + const TopoDS_Shape& theGeomShape, bool * use_precad ) { @@ -705,7 +705,7 @@ void BLSURFPlugin_BLSURF::SetParameters( // Clear map so that it is not stored in the algorithm with old enforced vertices in it EnfVertexCoords2EnfVertexList.clear(); - double diagonal = SMESH_Mesh::GetShapeDiagonalSize( GeomShape ); + double diagonal = SMESH_Mesh::GetShapeDiagonalSize( theGeomShape ); double bbSegmentation = _gen->GetBoundaryBoxSegmentation(); int _physicalMesh = BLSURFPlugin_Hypothesis::GetDefaultPhysicalMesh(); int _geometricMesh = BLSURFPlugin_Hypothesis::GetDefaultGeometricMesh(); @@ -1139,7 +1139,7 @@ void BLSURFPlugin_BLSURF::SetParameters( std::string grpName = BLSURFPlugin_Hypothesis::GetInternalEnforcedVertexAllFacesGroup(hyp); MESSAGE("Setting Internal Enforced Vertices"); gp_Pnt aPnt; - TopExp_Explorer exp (GeomShape, TopAbs_FACE); + TopExp_Explorer exp (theGeomShape, TopAbs_FACE); for (; exp.More(); exp.Next()){ MESSAGE("Iterating shapes. Shape type is " << exp.Current().ShapeType()); TopExp_Explorer exp_face (exp.Current(), TopAbs_VERTEX, TopAbs_EDGE); -- 2.39.2