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_main 01/04/2013
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Projection_3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_3D.cxx
b/src/StdMeshers/StdMeshers_Projection_3D.cxx
index 7c07b40f30df94dec0fa090391a5199268869a4e..767acddbb201173732e83a8a63ec1a1d8e332d3b 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_3D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-57,7
+57,7
@@
// cout << msg << " ("<< p.X() << "; " <<p.Y() << "; " <<p.Z() << ") " <<endl;\
// }
// cout << msg << " ("<< p.X() << "; " <<p.Y() << "; " <<p.Z() << ") " <<endl;\
// }
-
typedef StdMeshers_ProjectionUtils TAssocTool
;
+
namespace TAssocTool = StdMeshers_ProjectionUtils
;
//=======================================================================
//=======================================================================
@@
-233,13
+233,14
@@
bool StdMeshers_Projection_3D::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aS
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( _sourceHypo->GetSource3DShape() );
//SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( aShape );
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( _sourceHypo->GetSource3DShape() );
//SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( aShape );
- if ( tgtMesh == srcMesh && !aShape.IsSame( _sourceHypo->GetSource3DShape() )) {
+ string srcMeshError;
+ if ( tgtMesh == srcMesh && !aShape.IsSame( _sourceHypo->GetSource3DShape() )) {
if ( !TAssocTool::MakeComputed( srcSubMesh ))
if ( !TAssocTool::MakeComputed( srcSubMesh ))
-
return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"
);
+
srcMeshError = TAssocTool::SourceNotComputedError( srcSubMesh, this
);
}
else {
if ( !srcSubMesh->IsMeshComputed() )
}
else {
if ( !srcSubMesh->IsMeshComputed() )
-
return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed"
);
+
srcMeshError = TAssocTool::SourceNotComputedError(
);
}
// Find 2 pairs of corresponding vertices
}
// Find 2 pairs of corresponding vertices