X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.cxx;h=ee79fcd2c46636a2ec3b596c984c5b38e7db2b99;hb=c46bd4f9bb602f9863c817bcd622b1b70d5af1e9;hp=3f7994c1ffd9ca18a8c26de8b69fab0235fa8461;hpb=484fe83a97f643207334576fbe08d4a90d67fd37;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshEdge.cxx b/src/SMDS/SMDS_MeshEdge.cxx
index 3f7994c1f..ee79fcd2c 100644
--- a/src/SMDS/SMDS_MeshEdge.cxx
+++ b/src/SMDS/SMDS_MeshEdge.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -25,18 +25,23 @@
 //  Author : Jean-Michel BOULCOURT
 //  Module : SMESH
 
+#ifdef _MSC_VER
+#pragma warning(disable:4786)
+#endif
 
 #include "SMDS_MeshEdge.hxx"
 #include "SMDS_IteratorOfElements.hxx"
 #include "SMDS_MeshNode.hxx"
-#include <iostream>
+
+using namespace std;
 
 //=======================================================================
 //function : SMDS_MeshEdge
 //purpose  : 
 //=======================================================================
 
-SMDS_MeshEdge::SMDS_MeshEdge(SMDS_MeshNode * node1, SMDS_MeshNode * node2)
+SMDS_MeshEdge::SMDS_MeshEdge(const SMDS_MeshNode * node1,
+                             const SMDS_MeshNode * node2)
 {	
 	myNodes[0]=node1;
 	myNodes[1]=node2;
@@ -68,36 +73,40 @@ SMDSAbs_ElementType SMDS_MeshEdge::GetType() const
 	return SMDSAbs_Edge;
 }
 
-SMDS_Iterator<const SMDS_MeshElement *> * SMDS_MeshEdge::
+class SMDS_MeshEdge_MyNodeIterator:public SMDS_ElemIterator
+{
+  const SMDS_MeshNode *const* myNodes;
+  int myIndex;
+ public:
+  SMDS_MeshEdge_MyNodeIterator(const SMDS_MeshNode * const* nodes):
+    myNodes(nodes),myIndex(0) {}
+
+  bool more()
+  {
+    return myIndex<2;
+  }
+
+  const SMDS_MeshElement* next()
+  {
+    myIndex++;
+    return myNodes[myIndex-1];
+  }
+};
+
+SMDS_ElemIteratorPtr SMDS_MeshEdge::
 	elementsIterator(SMDSAbs_ElementType type) const
 {
-	class MyNodeIterator:public SMDS_Iterator<const SMDS_MeshElement *>
-	{
-		SMDS_MeshNode *const* myNodes;
-		int myIndex;
-	  public:
-		MyNodeIterator(SMDS_MeshNode * const* nodes):myNodes(nodes),myIndex(0)
-		{}	
-
-		bool more()
-		{
-			return myIndex<2;
-		}
-
-		const SMDS_MeshElement* next()
-		{
-			myIndex++;
-			return myNodes[myIndex-1];
-		}	
-	};
-
-	switch(type)
-	{
-	case SMDSAbs_Edge:return SMDS_MeshElement::elementsIterator(SMDSAbs_Edge); 
-	case SMDSAbs_Node:return new MyNodeIterator(myNodes);
-	default: return new SMDS_IteratorOfElements(this,type, nodesIterator());
-	}
-
+  switch(type)
+  {
+  case SMDSAbs_Edge:
+    return SMDS_MeshElement::elementsIterator(SMDSAbs_Edge); 
+  case SMDSAbs_Node:
+    return SMDS_ElemIteratorPtr(new SMDS_MeshEdge_MyNodeIterator(myNodes));
+  default:
+    return SMDS_ElemIteratorPtr
+      (new SMDS_IteratorOfElements
+       (this,type, SMDS_ElemIteratorPtr(new SMDS_MeshEdge_MyNodeIterator(myNodes))));
+  }
 }
 
 bool operator<(const SMDS_MeshEdge & e1, const SMDS_MeshEdge & e2)
@@ -125,3 +134,29 @@ bool operator<(const SMDS_MeshEdge & e1, const SMDS_MeshEdge & e2)
 	else if(id11==id21) return (id21<id22);
 	else return false;
 }
+
+/*!
+ * \brief Return node by its index
+ * \param ind - node index
+ * \retval const SMDS_MeshNode* - the node
+ * 
+ * Index is wrapped if it is out of a valid range
+ */
+const SMDS_MeshNode* SMDS_MeshEdge::GetNode(const int ind) const
+{
+  return myNodes[ WrappedIndex( ind )];
+}
+
+//=======================================================================
+//function : ChangeNodes
+//purpose  : 
+//=======================================================================
+
+bool SMDS_MeshEdge::ChangeNodes(const SMDS_MeshNode * node1,
+                                const SMDS_MeshNode * node2)
+{
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  return true;
+}
+