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
Fix compilation problems on Win32 Platform
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_ProjectionUtils.cxx
diff --git
a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index 01b04541f1617623b4077a8b6471bf5f507a1391..550ecb2e598b8aa8f3958c68e77b486b29522d10 100644
(file)
--- a/
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@
-25,8
+25,6
@@
// Created : Fri Oct 27 10:24:28 2006
// Author : Edward AGAPOV (eap)
// Created : Fri Oct 27 10:24:28 2006
// Author : Edward AGAPOV (eap)
-using namespace std;
-
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_ProjectionSource1D.hxx"
#include "StdMeshers_ProjectionUtils.hxx"
#include "StdMeshers_ProjectionSource1D.hxx"
@@
-66,6
+64,8
@@
using namespace std;
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeShape.hxx>
#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+using namespace std;
+
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \
@@
-1358,7
+1358,7
@@
FindMatchingNodesOnFaces( const TopoDS_Face& face1,
}
if ( nodesOfFaces )
{
}
if ( nodesOfFaces )
{
- if (
BRep_Tool::IsClosed( e2, fac
e2 )) {
+ if (
helper2.IsRealSeam(
e2 )) {
seam1 = e1; seam2 = e2;
}
else {
seam1 = e1; seam2 = e2;
}
else {
@@
-1430,7
+1430,7
@@
FindMatchingNodesOnFaces( const TopoDS_Face& face1,
const TopoDS_Face & face = is2 ? face2 : face1;
SMDS_ElemIteratorPtr eIt = sm->GetElements();
const TopoDS_Face & face = is2 ? face2 : face1;
SMDS_ElemIteratorPtr eIt = sm->GetElements();
- if ( !helper->Is
SeamShape
( is2 ? edge2 : edge1 ))
+ if ( !helper->Is
RealSeam
( is2 ? edge2 : edge1 ))
{
while ( eIt->more() ) elems.insert( eIt->next() );
}
{
while ( eIt->more() ) elems.insert( eIt->next() );
}
@@
-1515,7
+1515,7
@@
FindMatchingNodesOnFaces( const TopoDS_Face& face1,
// On a sphere, add matching nodes on the edge
// On a sphere, add matching nodes on the edge
- if ( helper1.Is
SeamShape
( edge1 ))
+ if ( helper1.Is
RealSeam
( edge1 ))
{
// sort nodes on edges by param on edge
map< double, const SMDS_MeshNode* > u2nodesMaps[2];
{
// sort nodes on edges by param on edge
map< double, const SMDS_MeshNode* > u2nodesMaps[2];