X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_FaceOfNodes.cxx;h=0b7f9acf989aad783e1ae6a32c6de20c144fceaf;hp=dfd3b7385eb45f424a0e4621fe6b2c1698bd95c2;hb=4c16067d4281f56bd07d3f92fb63fff9c0c1d169;hpb=04f997252152407f9180e03f0af428ab2ca6f4be

diff --git a/src/SMDS/SMDS_FaceOfNodes.cxx b/src/SMDS/SMDS_FaceOfNodes.cxx
index dfd3b7385..0b7f9acf9 100644
--- a/src/SMDS/SMDS_FaceOfNodes.cxx
+++ b/src/SMDS/SMDS_FaceOfNodes.cxx
@@ -26,15 +26,15 @@
 #pragma warning(disable:4786)
 #endif
 
-#include "SMDS_SetIterator.hxx"
 #include "SMDS_FaceOfNodes.hxx"
-#include "SMDS_IteratorOfElements.hxx"
+
+#include "SMDS_SetIterator.hxx"
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <utilities.h>
 
-using namespace std;
+#include <boost/make_shared.hpp>
 
 //=======================================================================
 //function : NbEdges
@@ -43,17 +43,25 @@ using namespace std;
 
 int SMDS_FaceOfNodes::NbEdges() const
 {
-        return NbNodes();
+  return NbNodes();
 }
 
 int SMDS_FaceOfNodes::NbFaces() const
 {
-        return 1;
+  return 1;
 }
 
 int SMDS_FaceOfNodes::NbNodes() const
 {
-        return myNbNodes;
+  return myNbNodes;
+}
+
+int SMDS_FaceOfNodes::GetNodeIndex( const SMDS_MeshNode* node ) const
+{
+  for ( int i = 0; i < myNbNodes; ++i )
+    if ( myNodes[i] == node )
+      return i;
+  return -1;
 }
 
 //=======================================================================
@@ -63,81 +71,31 @@ int SMDS_FaceOfNodes::NbNodes() const
 
 void SMDS_FaceOfNodes::Print(ostream & OS) const
 {
-        OS << "face <" << GetID() << " > : ";
-        int i;
-        for (i = 0; i < NbNodes() - 1; i++) OS << myNodes[i] << ",";
-        OS << myNodes[i] << ") " << endl;
+  OS << "face <" << GetID() << " > : ";
+  int i;
+  for (i = 0; i < NbNodes() - 1; i++) OS << myNodes[i] << ",";
+  OS << myNodes[i] << ") " << endl;
 }
 
-//=======================================================================
-//function : elementsIterator
-//purpose  : 
-//=======================================================================
-
-class SMDS_FaceOfNodes_MyIterator:public SMDS_NodeArrayElemIterator
+SMDS_ElemIteratorPtr SMDS_FaceOfNodes::nodesIterator() const
 {
- public:
-  SMDS_FaceOfNodes_MyIterator(const SMDS_MeshNode* const *s, int l):
-    SMDS_NodeArrayElemIterator( s, & s[ l ] ) {}
-};
-
-/// ===================================================================
-/*!
- * \brief Iterator on edges of face
- */
-/// ===================================================================
+  return boost::make_shared< SMDS_NodeArrayElemIterator >( &myNodes[0], &myNodes[0] + NbNodes() );
+}
 
-class _MyEdgeIterator : public SMDS_ElemIterator
-{
-  vector< const SMDS_MeshElement* > myElems;
-  size_t                            myIndex;
-public:
-  _MyEdgeIterator(const SMDS_FaceOfNodes* face):myIndex(0) {
-    myElems.reserve( face->NbNodes() );
-    for ( int i = 0; i < face->NbNodes(); ++i ) {
-      const SMDS_MeshElement* edge =
-        SMDS_Mesh::FindEdge( face->GetNode( i ), face->GetNodeWrap( i + 1 ));
-      if ( edge )
-        myElems.push_back( edge );
-    }
-  }
-  /// Return true if and only if there are other object in this iterator
-  virtual bool more() { return myIndex < myElems.size(); }
-
-  /// Return the current object and step to the next one
-  virtual const SMDS_MeshElement* next() { return myElems[ myIndex++ ]; }
-};
-
-SMDS_ElemIteratorPtr SMDS_FaceOfNodes::elementsIterator( SMDSAbs_ElementType type ) const
+SMDS_NodeIteratorPtr SMDS_FaceOfNodes::nodeIterator() const
 {
-  switch(type)
-  {
-  case SMDSAbs_Face:
-    return SMDS_MeshElement::elementsIterator(SMDSAbs_Face);
-  case SMDSAbs_Node:
-    return SMDS_ElemIteratorPtr(new SMDS_FaceOfNodes_MyIterator(myNodes,myNbNodes));
-  case SMDSAbs_Edge:
-    return SMDS_ElemIteratorPtr(new _MyEdgeIterator( this ));
-    break;
-  default:
-    return SMDS_ElemIteratorPtr
-      (new SMDS_IteratorOfElements
-       (this,type,SMDS_ElemIteratorPtr
-        (new SMDS_FaceOfNodes_MyIterator(myNodes,myNbNodes))));
-  }
-  return SMDS_ElemIteratorPtr();
+  return boost::make_shared< SMDS_NodeArrayIterator >( &myNodes[0], &myNodes[0] + NbNodes() );
 }
 
 SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
                                    const SMDS_MeshNode* node2,
                                    const SMDS_MeshNode* node3)
 {
-  //MESSAGE("******************************************************* SMDS_FaceOfNodes");
-        myNbNodes = 3;
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=0;
+  myNbNodes = 3;
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=0;
 }
 
 SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
@@ -145,12 +103,11 @@ SMDS_FaceOfNodes::SMDS_FaceOfNodes(const SMDS_MeshNode* node1,
                                    const SMDS_MeshNode* node3,
                                    const SMDS_MeshNode* node4)
 {
-  //MESSAGE("******************************************************* SMDS_FaceOfNodes");
-        myNbNodes = 4;
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=node4;       
+  myNbNodes = 4;
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=node4;       
 }
 bool SMDS_FaceOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
                                    const int            nbNodes)