X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshEdge.hxx;h=75ff74e743db52e668c9127325bf8b786e7a2a89;hb=54d277e9e3ba8789be5a561d280b86b979266c87;hp=4d82d003c321bb7f037ebeddcc973338a0421a16;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_MeshEdge.hxx b/src/SMDS/SMDS_MeshEdge.hxx
index 4d82d003c..75ff74e74 100644
--- a/src/SMDS/SMDS_MeshEdge.hxx
+++ b/src/SMDS/SMDS_MeshEdge.hxx
@@ -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
 //
 //
 //
@@ -27,98 +27,39 @@
 #ifndef _SMDS_MeshEdge_HeaderFile
 #define _SMDS_MeshEdge_HeaderFile
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Handle_SMDS_MeshEdge_HeaderFile
-#include "Handle_SMDS_MeshEdge.hxx"
-#endif
-
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _SMDS_MeshElement_HeaderFile
 #include "SMDS_MeshElement.hxx"
-#endif
-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
-#ifndef _Standard_OStream_HeaderFile
-#include <Standard_OStream.hxx>
-#endif
-
-
-class SMDS_MeshEdge : public SMDS_MeshElement {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT SMDS_MeshEdge(const Standard_Integer ID,const Standard_Integer idnode1,const Standard_Integer idnode2);
-Standard_EXPORT inline   void ComputeKey() ;
-Standard_EXPORT inline   Standard_Integer GetKey() const;
-Standard_EXPORT inline   Standard_Address GetConnections() const;
-Standard_EXPORT inline   Standard_Integer GetConnection(const Standard_Integer rank) const;
-Standard_EXPORT   void Print(Standard_OStream& OS) const;
-Standard_EXPORT ~SMDS_MeshEdge();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& SMDS_MeshEdge_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-Standard_EXPORT   void SetConnections(const Standard_Integer idnode1,const Standard_Integer idnode2) ;
-
-
- // Fields PRIVATE
- //
-Standard_Integer myKey;
-Standard_Integer myNodes[2];
-
+#include <iostream>
+
+class SMDS_MeshEdge:public SMDS_MeshElement
+{
+
+  public:
+	SMDS_MeshEdge(const SMDS_MeshNode * node1,
+                      const SMDS_MeshNode * node2);
+        bool ChangeNodes(const SMDS_MeshNode * node1,
+                         const SMDS_MeshNode * node2);
+	void Print(std::ostream & OS) const;
+
+	SMDSAbs_ElementType GetType() const;
+	int NbNodes() const;
+	int NbEdges() const;
+	friend bool operator<(const SMDS_MeshEdge& e1, const SMDS_MeshEdge& e2);
+
+  /*!
+   * \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
+   */
+  virtual const SMDS_MeshNode* GetNode(const int ind) const;
+
+  protected:
+	SMDS_ElemIteratorPtr
+		elementsIterator(SMDSAbs_ElementType type) const;
+
+  protected:
+	const SMDS_MeshNode* myNodes[3];
 
 };
-
-
-#include "SMDS_MeshEdge.lxx"
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif