Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_5_BR 05/06/2012
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Projection_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
index 6dfbad18cc37540446a46cf0711ada5ec84bbff7..efe6bf034819dd7a5c7a696f65812988343d9b55 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-196,7
+196,7
@@
bool StdMeshers_Projection_1D2D::Evaluate(SMESH_Mesh& theMesh,
typedef StdMeshers_ProjectionUtils SPU;
SPU::TShapeShapeMap shape2ShapeMap;
typedef StdMeshers_ProjectionUtils SPU;
SPU::TShapeShapeMap shape2ShapeMap;
- SPU::InitVertexAssociation( _sourceHypo, shape2ShapeMap
, theShape
);
+ SPU::InitVertexAssociation( _sourceHypo, shape2ShapeMap );
if ( !SPU::FindSubShapeAssociation( theShape, &theMesh, srcFace, srcMesh, shape2ShapeMap))
return error(COMPERR_BAD_SHAPE,"Topology of source and target faces seems different" );
if ( !SPU::FindSubShapeAssociation( theShape, &theMesh, srcFace, srcMesh, shape2ShapeMap))
return error(COMPERR_BAD_SHAPE,"Topology of source and target faces seems different" );
@@
-232,7
+232,7
@@
bool StdMeshers_Projection_1D2D::Evaluate(SMESH_Mesh& theMesh,
if ( aVec.empty() )
return error(COMPERR_BAD_INPUT_MESH,"Source mesh is wrongly evaluated");
}
if ( aVec.empty() )
return error(COMPERR_BAD_INPUT_MESH,"Source mesh is wrongly evaluated");
}
- TopoDS_Shape tgtEdge = shape2ShapeMap( srcSM->GetSubShape() );
+ TopoDS_Shape tgtEdge = shape2ShapeMap( srcSM->GetSubShape()
, /*isSrc=*/true
);
SMESH_subMesh* tgtSM = theMesh.GetSubMesh( tgtEdge );
aResMap.insert(std::make_pair(tgtSM,aVec));
}
SMESH_subMesh* tgtSM = theMesh.GetSubMesh( tgtEdge );
aResMap.insert(std::make_pair(tgtSM,aVec));
}