X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMDS%2FSMDS_VolumeOfNodes.cxx;h=f652eeaf26ec57ab13a80b1bb1650a9ef11928da;hb=890ce9fde2b20bce7100085707035b210b08811c;hp=25c0bf567dee9412ea162930edff5233dbc6a181;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index 25c0bf567..f652eeaf2 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -1,191 +1,231 @@
-//  SMESH SMDS : implementaion of Salome mesh data structure
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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 
+
+//  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 "utilities.h"
+#include "SMDS_SetIterator.hxx"
+
+#include <boost/make_shared.hpp>
 
-using namespace std;
+#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)
-{
-	myNodes.resize(8);
-	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)
-{
-	myNodes.resize(4);
-	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)
-{
-	myNodes.resize(5);
-	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)
-{
-	myNodes.resize(6);
-	myNodes[0]=node1;
-	myNodes[1]=node2;
-	myNodes[2]=node3;
-	myNodes[3]=node4;
-	myNodes[4]=node5;
-	myNodes[5]=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,
+                                       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)
+{
+  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)
+{
+  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)
+{
+  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[],
                                      const int            nbNodes)
 {
   if (nbNodes < 4 || nbNodes > 8 || nbNodes == 7)
     return false;
 
-  myNodes.resize( nbNodes );
+  delete [] myNodes;
+  myNbNodes = nbNodes;
+  myNodes = new const SMDS_MeshNode* [myNbNodes];
   for ( int i = 0; i < nbNodes; i++ )
     myNodes[ i ] = nodes [ i ];
 
   return true;
 }
-//=======================================================================
-//function : Print
-//purpose  : 
-//=======================================================================
 
-void SMDS_VolumeOfNodes::Print(ostream & OS) const
+SMDS_VolumeOfNodes::~SMDS_VolumeOfNodes()
+{
+  if (myNodes != NULL) {
+    delete [] myNodes;
+    myNodes = NULL;
+  }
+}
+
+void SMDS_VolumeOfNodes::Print(std::ostream & OS) const
 {
-	OS << "volume <" << GetID() << "> : ";
-	int i;
-	for (i = 0; i < NbNodes(); ++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 myNodes.size();
+  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;
+  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;
 }
 
-class SMDS_VolumeOfNodes_MyIterator:public SMDS_ElemIterator
+
+SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const
 {
-  const vector<const SMDS_MeshNode*>& mySet;
-  int index;
- public:
-  SMDS_VolumeOfNodes_MyIterator(const vector<const SMDS_MeshNode*>& s):
-    mySet(s),index(0) {}
+  return SMDSAbs_Volume;
+}
 
-  bool more()
-  {
-    return index<mySet.size();
-  }
+/*!
+ * \brief Return node by its index
+ * \param ind - node index
+ * \retval const SMDS_MeshNode* - the node
+ */
+const SMDS_MeshNode* SMDS_VolumeOfNodes::GetNode(const int ind) const
+{
+  return myNodes[ ind ];
+}
 
-  const SMDS_MeshElement* next()
+SMDSAbs_EntityType SMDS_VolumeOfNodes::GetEntityType() const
+{
+  SMDSAbs_EntityType aType = SMDSEntity_Tetra;
+  switch(myNbNodes)
   {
-    index++;
-    return mySet[index-1];
+  case 4: aType = SMDSEntity_Tetra;   break;
+  case 5: aType = SMDSEntity_Pyramid; break;
+  case 6: aType = SMDSEntity_Penta;   break;
+  case 8:
+  default: aType = SMDSEntity_Hexa;    break;
   }
-};
+  return aType;
+}
 
-SMDS_ElemIteratorPtr SMDS_VolumeOfNodes::
-	elementsIterator(SMDSAbs_ElementType type) const
+SMDSAbs_GeometryType SMDS_VolumeOfNodes::GetGeomType() const
 {
-  switch(type)
+  SMDSAbs_GeometryType aType = SMDSGeom_NONE;
+  switch(myNbNodes)
   {
-  case SMDSAbs_Volume:
-    return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
-  case SMDSAbs_Node:
-    return SMDS_ElemIteratorPtr(new SMDS_VolumeOfNodes_MyIterator(myNodes));
-  default:
-    MESSAGE("ERROR : Iterator not implemented");
-    return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
+  case 4: aType = SMDSGeom_TETRA;   break;
+  case 5: aType = SMDSGeom_PYRAMID; break;
+  case 6: aType = SMDSGeom_PENTA;   break;
+  case 12: aType = SMDSGeom_HEXAGONAL_PRISM; break;
+  case 8:
+  default: aType = SMDSGeom_HEXA;    break;
   }
+  return aType;
 }
 
-SMDSAbs_ElementType SMDS_VolumeOfNodes::GetType() const
+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 SMDSAbs_Volume;
+  return boost::make_shared< SMDS_NodeArrayIterator >( &myNodes[0], &myNodes[0] + NbNodes() );
 }