-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014 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
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// cout << msg << " ("<< p.X() << "; " <<p.Y() << "; " <<p.Z() << ") " <<endl;\
// }
-typedef StdMeshers_ProjectionUtils TAssocTool;
+namespace TAssocTool = StdMeshers_ProjectionUtils;
//=======================================================================
SMESH_Comment("Target shape must have 1 shell but not ") << nbShell);
// Check that shapes are blocks
- if ( TAssocTool::Count( tgtShell, TopAbs_FACE , 1 ) != 6 ||
- TAssocTool::Count( tgtShell, TopAbs_EDGE , 1 ) != 12 ||
- TAssocTool::Count( tgtShell, TopAbs_WIRE , 1 ) != 6 )
+ if ( SMESH_MesherHelper::Count( tgtShell, TopAbs_FACE , 1 ) != 6 ||
+ SMESH_MesherHelper::Count( tgtShell, TopAbs_EDGE , 1 ) != 12 ||
+ SMESH_MesherHelper::Count( tgtShell, TopAbs_WIRE , 1 ) != 6 )
return error(COMPERR_BAD_SHAPE, "Target shape is not a block");
- if ( TAssocTool::Count( srcShell, TopAbs_FACE , 1 ) != 6 ||
- TAssocTool::Count( srcShell, TopAbs_EDGE , 1 ) != 12 ||
- TAssocTool::Count( srcShell, TopAbs_WIRE , 1 ) != 6 )
+ if ( SMESH_MesherHelper::Count( srcShell, TopAbs_FACE , 1 ) != 6 ||
+ SMESH_MesherHelper::Count( srcShell, TopAbs_EDGE , 1 ) != 12 ||
+ SMESH_MesherHelper::Count( srcShell, TopAbs_WIRE , 1 ) != 6 )
return error(COMPERR_BAD_SHAPE, "Source shape is not a block");
// Assure that mesh on a source shape is computed
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 ))
- return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed");
+ srcMeshError = TAssocTool::SourceNotComputedError( srcSubMesh, this );
}
else {
if ( !srcSubMesh->IsMeshComputed() )
- return error(COMPERR_BAD_INPUT_MESH,"Source mesh not computed");
+ srcMeshError = TAssocTool::SourceNotComputedError();
}
// Find 2 pairs of corresponding vertices
}
}
// Find matching nodes of tgt and src faces
- TNodeNodeMap faceMatchingNodes;
+ TAssocTool::TNodeNodeMap faceMatchingNodes;
if ( ! TAssocTool::FindMatchingNodesOnFaces( srcFace, srcMesh, tgtFace, tgtMesh,
shape2ShapeMap, faceMatchingNodes ))
return error(COMPERR_BAD_INPUT_MESH,SMESH_Comment("Mesh on faces #")
SMESH_Comment("Target shape must have 1 shell but not ") << nbShell);
// Check that shapes are blocks
- if ( TAssocTool::Count( tgtShell, TopAbs_FACE , 1 ) != 6 ||
- TAssocTool::Count( tgtShell, TopAbs_EDGE , 1 ) != 12 ||
- TAssocTool::Count( tgtShell, TopAbs_WIRE , 1 ) != 6 )
+ if ( SMESH_MesherHelper::Count( tgtShell, TopAbs_FACE , 1 ) != 6 ||
+ SMESH_MesherHelper::Count( tgtShell, TopAbs_EDGE , 1 ) != 12 ||
+ SMESH_MesherHelper::Count( tgtShell, TopAbs_WIRE , 1 ) != 6 )
return error(COMPERR_BAD_SHAPE, "Target shape is not a block");
- if ( TAssocTool::Count( srcShell, TopAbs_FACE , 1 ) != 6 ||
- TAssocTool::Count( srcShell, TopAbs_EDGE , 1 ) != 12 ||
- TAssocTool::Count( srcShell, TopAbs_WIRE , 1 ) != 6 )
+ if ( SMESH_MesherHelper::Count( srcShell, TopAbs_FACE , 1 ) != 6 ||
+ SMESH_MesherHelper::Count( srcShell, TopAbs_EDGE , 1 ) != 12 ||
+ SMESH_MesherHelper::Count( srcShell, TopAbs_WIRE , 1 ) != 6 )
return error(COMPERR_BAD_SHAPE, "Source shape is not a block");
// Assure that mesh on a source shape is computed