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
0022360: EDF SMESH: Body Fitting algorithm: incorporate edges
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Projection_1D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_1D.cxx
b/src/StdMeshers/StdMeshers_Projection_1D.cxx
index 778b57c0e605d36495fe5dd7b72b1b9f3ff2921a..4d9fad9190d0522fdbbcf77a7ee2d4cdb86af48e 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_1D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_1D.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,8
@@
using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
-typedef StdMeshers_ProjectionUtils TAssocTool;
+//typedef StdMeshers_ProjectionUtils TAssocTool;
+namespace TAssocTool = StdMeshers_ProjectionUtils;
//=======================================================================
//function : StdMeshers_Projection_1D
//=======================================================================
//function : StdMeshers_Projection_1D
@@
-238,14
+239,18
@@
bool StdMeshers_Projection_1D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcEdge );
//SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( tgtEdge );
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcEdge );
//SMESH_subMesh* tgtSubMesh = tgtMesh->GetSubMesh( tgtEdge );
+ string srcMeshError;
if ( tgtMesh == srcMesh ) {
if ( !TAssocTool::MakeComputed( srcSubMesh ))
if ( tgtMesh == srcMesh ) {
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(
);
}
}
+ if ( !srcMeshError.empty() )
+ return error(COMPERR_BAD_INPUT_MESH, srcMeshError );
+
// -----------------------------------------------
// Find out nodes distribution on the source edge
// -----------------------------------------------
// -----------------------------------------------
// Find out nodes distribution on the source edge
// -----------------------------------------------