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 branch 'agy/arch2_ic0'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_ProjectionSource2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
index 479bdd6eca6f29bf8d70aec89f7ab05fd2d926e5..d3334e295ad367f9ed0f496078f59a8e03c885d1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
+++ b/
src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-28,6
+28,7
@@
#include "StdMeshers_ProjectionSource2D.hxx"
#include "SMESH_Mesh.hxx"
#include "StdMeshers_ProjectionSource2D.hxx"
#include "SMESH_Mesh.hxx"
+#include "SMESH_MesherHelper.hxx"
#include "StdMeshers_ProjectionUtils.hxx"
#include "utilities.h"
#include "StdMeshers_ProjectionUtils.hxx"
#include "utilities.h"
@@
-44,9
+45,9
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_ProjectionSource2D::StdMeshers_ProjectionSource2D(int hypId,
int studyId,
+StdMeshers_ProjectionSource2D::StdMeshers_ProjectionSource2D(int hypId,
SMESH_Gen * gen)
SMESH_Gen * gen)
- : SMESH_Hypothesis(hypId,
studyId,
gen)
+ : SMESH_Hypothesis(hypId, gen)
{
_name = "ProjectionSource2D"; // used by Projection_2D
_param_algo_dim = 2; // 2D
{
_name = "ProjectionSource2D"; // used by Projection_2D
_param_algo_dim = 2; // 2D
@@
-63,17
+64,15
@@
StdMeshers_ProjectionSource2D::StdMeshers_ProjectionSource2D(int hypId, int stud
StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D()
{
StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D()
{
- MESSAGE( "StdMeshers_ProjectionSource2D::~StdMeshers_ProjectionSource2D" );
}
//=============================================================================
}
//=============================================================================
-
/*!
-
* Sets a source <face> to take a mesh pattern from
-
*/
+/*!
+ * Sets a source <face> to take a mesh pattern from
+ */
//=============================================================================
void StdMeshers_ProjectionSource2D::SetSourceFace(const TopoDS_Shape& Face)
//=============================================================================
void StdMeshers_ProjectionSource2D::SetSourceFace(const TopoDS_Shape& Face)
- throw ( SALOME_Exception )
{
if ( Face.IsNull() )
throw SALOME_Exception(LOCALIZED("Null Face is not allowed"));
{
if ( Face.IsNull() )
throw SALOME_Exception(LOCALIZED("Null Face is not allowed"));
@@
-101,7
+100,6
@@
void StdMeshers_ProjectionSource2D::SetVertexAssociation(const TopoDS_Shape& sou
const TopoDS_Shape& sourceVertex2,
const TopoDS_Shape& targetVertex1,
const TopoDS_Shape& targetVertex2)
const TopoDS_Shape& sourceVertex2,
const TopoDS_Shape& targetVertex1,
const TopoDS_Shape& targetVertex2)
- throw ( SALOME_Exception )
{
if ( sourceVertex1.IsNull() != targetVertex1.IsNull() ||
sourceVertex2.IsNull() != targetVertex2.IsNull() )
{
if ( sourceVertex1.IsNull() != targetVertex1.IsNull() ||
sourceVertex2.IsNull() != targetVertex2.IsNull() )
@@
-111,7
+109,7
@@
void StdMeshers_ProjectionSource2D::SetVertexAssociation(const TopoDS_Shape& sou
{
// possibly there is only 1 vertex in the face
if ( !_sourceFace.IsNull() &&
{
// possibly there is only 1 vertex in the face
if ( !_sourceFace.IsNull() &&
- S
tdMeshers_ProjectionUtils
::Count( _sourceFace, TopAbs_VERTEX, /*ignoreSame=*/true) != 1 )
+ S
MESH_MesherHelper
::Count( _sourceFace, TopAbs_VERTEX, /*ignoreSame=*/true) != 1 )
throw SALOME_Exception(LOCALIZED("Two or none pairs of vertices must be provided"));
}
throw SALOME_Exception(LOCALIZED("Two or none pairs of vertices must be provided"));
}
@@
-173,7
+171,6
@@
TopoDS_Shape StdMeshers_ProjectionSource2D::GetSourceFace() const
//=============================================================================
TopoDS_Vertex StdMeshers_ProjectionSource2D::GetSourceVertex(int i) const
//=============================================================================
TopoDS_Vertex StdMeshers_ProjectionSource2D::GetSourceVertex(int i) const
- throw ( SALOME_Exception )
{
if ( i == 1 )
return _sourceVertex1;
{
if ( i == 1 )
return _sourceVertex1;
@@
-191,7
+188,6
@@
TopoDS_Vertex StdMeshers_ProjectionSource2D::GetSourceVertex(int i) const
//=============================================================================
TopoDS_Vertex StdMeshers_ProjectionSource2D::GetTargetVertex(int i) const
//=============================================================================
TopoDS_Vertex StdMeshers_ProjectionSource2D::GetTargetVertex(int i) const
- throw ( SALOME_Exception )
{
if ( i == 1 )
return _targetVertex1;
{
if ( i == 1 )
return _targetVertex1;