X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=f652eeaf26ec57ab13a80b1bb1650a9ef11928da;hp=670802e76a56180b4d19c77cb8d5762f1de059e0;hb=d8bc11015235c68631ac85d7e8cf278edc9809d1;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index 670802e76..f652eeaf2 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -20,97 +20,89 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMDS : implementaion of Salome mesh data structure
+//  SMESH SMDS : implementation of Salome mesh data structure
 //
 #ifdef _MSC_VER
 #pragma warning(disable:4786)
 #endif
 
 #include "SMDS_VolumeOfNodes.hxx"
+
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
-#include "SMDS_VolumeTool.hxx"
-#include "SMDS_Mesh.hxx"
-#include "utilities.h"
 
-using namespace std;
+#include <boost/make_shared.hpp>
+
+#include <utilities.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Create an hexahedron. node 1,2,3,4 and 5,6,7,8 are quadrangle and
 /// 5,1 and 7,3 are an edges.
 ///////////////////////////////////////////////////////////////////////////////
-SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
-                const SMDS_MeshNode * node1,
-                const SMDS_MeshNode * node2,
-                const SMDS_MeshNode * node3,
-                const SMDS_MeshNode * node4,
-                const SMDS_MeshNode * node5,
-                const SMDS_MeshNode * node6,
-                const SMDS_MeshNode * node7,
-                const SMDS_MeshNode * node8)
-{
-  //MESSAGE("***************************************************** SMDS_VolumeOfNodes");
-        myNbNodes = 8;
-        myNodes = new const SMDS_MeshNode* [myNbNodes];
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=node4;
-        myNodes[4]=node5;
-        myNodes[5]=node6;
-        myNodes[6]=node7;
-        myNodes[7]=node8;
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                                       const SMDS_MeshNode * node2,
+                                       const SMDS_MeshNode * node3,
+                                       const SMDS_MeshNode * node4,
+                                       const SMDS_MeshNode * node5,
+                                       const SMDS_MeshNode * node6,
+                                       const SMDS_MeshNode * node7,
+                                       const SMDS_MeshNode * node8)
+{
+  myNbNodes = 8;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=node4;
+  myNodes[4]=node5;
+  myNodes[5]=node6;
+  myNodes[6]=node7;
+  myNodes[7]=node8;
 }
 
-SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
-                const SMDS_MeshNode * node1,
-                const SMDS_MeshNode * node2,
-                const SMDS_MeshNode * node3,
-                const SMDS_MeshNode * node4)
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                                       const SMDS_MeshNode * node2,
+                                       const SMDS_MeshNode * node3,
+                                       const SMDS_MeshNode * node4)
 {
-  //MESSAGE("***************************************************** SMDS_VolumeOfNodes");
-        myNbNodes = 4;
-        myNodes = new const SMDS_MeshNode* [myNbNodes];
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=node4;
+  myNbNodes = 4;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=node4;
 }
 
-SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
-                const SMDS_MeshNode * node1,
-                const SMDS_MeshNode * node2,
-                const SMDS_MeshNode * node3,
-                const SMDS_MeshNode * node4,
-                const SMDS_MeshNode * node5)
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                                       const SMDS_MeshNode * node2,
+                                       const SMDS_MeshNode * node3,
+                                       const SMDS_MeshNode * node4,
+                                       const SMDS_MeshNode * node5)
 {
-  //MESSAGE("***************************************************** SMDS_VolumeOfNodes");
-        myNbNodes = 5;
-        myNodes = new const SMDS_MeshNode* [myNbNodes];
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=node4;
-        myNodes[4]=node5;
+  myNbNodes = 5;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=node4;
+  myNodes[4]=node5;
 }
 
-SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(
-                const SMDS_MeshNode * node1,
-                const SMDS_MeshNode * node2,
-                const SMDS_MeshNode * node3,
-                const SMDS_MeshNode * node4,
-                const SMDS_MeshNode * node5,
-                const SMDS_MeshNode * node6)
+SMDS_VolumeOfNodes::SMDS_VolumeOfNodes(const SMDS_MeshNode * node1,
+                                       const SMDS_MeshNode * node2,
+                                       const SMDS_MeshNode * node3,
+                                       const SMDS_MeshNode * node4,
+                                       const SMDS_MeshNode * node5,
+                                       const SMDS_MeshNode * node6)
 {
-  //MESSAGE("***************************************************** SMDS_VolumeOfNodes");
-        myNbNodes = 6;
-        myNodes = new const SMDS_MeshNode* [myNbNodes];
-        myNodes[0]=node1;
-        myNodes[1]=node2;
-        myNodes[2]=node3;
-        myNodes[3]=node4;
-        myNodes[4]=node5;
-        myNodes[5]=node6;
+  myNbNodes = 6;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
+  myNodes[0]=node1;
+  myNodes[1]=node2;
+  myNodes[2]=node3;
+  myNodes[3]=node4;
+  myNodes[4]=node5;
+  myNodes[5]=node6;
 }
 
 bool SMDS_VolumeOfNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
@@ -136,98 +128,49 @@ SMDS_VolumeOfNodes::~SMDS_VolumeOfNodes()
   }
 }
 
-void SMDS_VolumeOfNodes::Print(ostream & OS) const
+void SMDS_VolumeOfNodes::Print(std::ostream & OS) const
 {
-        OS << "volume <" << GetID() << "> : ";
-        int i;
-        for (i = 0; i < NbNodes()-1; ++i) OS << myNodes[i] << ",";
-        OS << myNodes[NbNodes()-1]<< ") " << endl;
+  OS << "volume <" << GetID() << "> : ";
+  int i;
+  for (i = 0; i < NbNodes()-1; ++i) OS << myNodes[i] << ",";
+  OS << myNodes[NbNodes()-1]<< ") " << std::endl;
 }
 
 int SMDS_VolumeOfNodes::NbFaces() const
 {
-        switch(NbNodes())
-        {
-        case 4: return 4;
-        case 5: return 5;
-        case 6: return 5;
-        case 8: return 6;
-        default: MESSAGE("invalid number of nodes");
-        }
-        return 0;
+  switch(NbNodes())
+  {
+  case 4: return 4;
+  case 5: return 5;
+  case 6: return 5;
+  case 8: return 6;
+  default: MESSAGE("invalid number of nodes");
+  }
+  return 0;
 }
 
 int SMDS_VolumeOfNodes::NbNodes() const
 {
-        return myNbNodes;
+  return myNbNodes;
 }
 
 int SMDS_VolumeOfNodes::NbEdges() const
 {
-        switch(NbNodes())
-        {
-        case 4: return 6;
-        case 5: return 8;
-        case 6: return 9;
-        case 8: return 12;
-        default: MESSAGE("invalid number of nodes");
-        }
-        return 0;
-}
-
-/*!
- * \brief Iterator on node of volume
- */
-class SMDS_VolumeOfNodes_MyIterator:public SMDS_NodeArrayElemIterator
-{
- public:
-  SMDS_VolumeOfNodes_MyIterator(const SMDS_MeshNode* const* s, int l):
-    SMDS_NodeArrayElemIterator( s, & s[ l ]) {}
-};
-
-/*!
- * \brief Iterator on faces or edges of volume
- */
-class _MySubIterator : public SMDS_ElemIterator
-{
-  vector< const SMDS_MeshElement* > myElems;
-  size_t myIndex;
-public:
-  _MySubIterator(const SMDS_VolumeOfNodes* vol, SMDSAbs_ElementType type):myIndex(0) {
-    SMDS_VolumeTool vTool(vol);
-    if (type == SMDSAbs_Face)
-      vTool.GetAllExistingFaces( myElems );
-    else
-      vTool.GetAllExistingFaces( myElems );
-  }
-  /// 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_VolumeOfNodes::elementsIterator(SMDSAbs_ElementType type) const
-{
-  switch(type)
+  switch(NbNodes())
   {
-  case SMDSAbs_Volume:
-    return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
-  case SMDSAbs_Node:
-    return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes,myNbNodes));
-  case SMDSAbs_Face:
-    return SMDS_ElemIteratorPtr(new _MySubIterator(this,SMDSAbs_Face));
-  case SMDSAbs_Edge:
-    return SMDS_ElemIteratorPtr(new _MySubIterator(this,SMDSAbs_Edge));
-  default:
-    MESSAGE("ERROR : Iterator not implemented");
-    return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
+  case 4: return 6;
+  case 5: return 8;
+  case 6: return 9;
+  case 8: return 12;
+  default: MESSAGE("invalid number of nodes");
   }
+  return 0;
 }
 
+
 SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const
 {
-        return SMDSAbs_Volume;
+  return SMDSAbs_Volume;
 }
 
 /*!
@@ -269,3 +212,20 @@ SMDSAbs_GeometryType SMDS_VolumeOfNodes::GetGeomType() const
   return aType;
 }
 
+int  SMDS_VolumeOfNodes::GetNodeIndex( const SMDS_MeshNode* node ) const
+{
+  for ( int i = 0; i < myNbNodes; ++i )
+    if ( myNodes[i] == node )
+      return i;
+  return -1;
+}
+
+SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::nodesIterator() const
+{
+  return boost::make_shared< SMDS_NodeArrayElemIterator >( &myNodes[0], &myNodes[0] + NbNodes() );
+}
+
+SMDS_NodeIteratorPtr SMDS_VolumeOfNodes::nodeIterator() const
+{
+  return boost::make_shared< SMDS_NodeArrayIterator >( &myNodes[0], &myNodes[0] + NbNodes() );
+}