PR: merged from V5_1_4rc1

[modules/smesh.git] / src / SMDS / SMDS_VolumeOfNodes.cxx

diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index b44bae07cb3c8aeebaae955d50d13c0cddfd3b41..507fea94eeb0b787e1dbcd96e535d7c891f4e638 100644 (file)
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH SMDS : implementaion of Salome mesh data structure
 //
 #ifdef _MSC_VER
@@ -29,10 +30,9 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
+#include "SMDS_Mesh.hxx"
 #include "utilities.h"
 
-#include <vector>
-
 using namespace std;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -251,103 +251,3 @@ SMDSAbs_EntityType SMDS_VolumeOfNodes::GetEntityType() const
 }
 
 
-// *************************************************************************************
-// 
-
-SMDS_VolumeVtkNodes::SMDS_VolumeVtkNodes()
-{
-}
-
-bool SMDS_VolumeVtkNodes::ChangeNodes(const SMDS_MeshNode* nodes[],
-                                     const int            nbNodes)
-{
-  // utilise dans SMDS_Mesh
-  return true;
-}
-
-SMDS_VolumeVtkNodes::~SMDS_VolumeVtkNodes()
-{
-}
-
-void SMDS_VolumeVtkNodes::Print(ostream & OS) const
-{
-        OS << "volume <" << GetID() << "> : ";
-}
-
-int SMDS_VolumeVtkNodes::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;
-}
-
-int SMDS_VolumeVtkNodes::NbNodes() const
-{
-        return 0;
-}
-
-int SMDS_VolumeVtkNodes::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;
-}
-
-SMDS_ElemIteratorPtr SMDS_VolumeVtkNodes::elementsIterator(SMDSAbs_ElementType type) const
-{
-  switch(type)
-  {
-//   case SMDSAbs_Volume:
-//     return SMDS_MeshElement::elementsIterator(SMDSAbs_Volume);
-//   case SMDSAbs_Node:
-//     return SMDS_ElemIteratorPtr(new SMDS_VolumeVtkNodes_MyIterator(myNodes,myNbNodes));
-//   case SMDSAbs_Face:
-//     return SMDS_ElemIteratorPtr(new _MySubWNIterator(this,SMDSAbs_Face));
-//   case SMDSAbs_Edge:
-//     return SMDS_ElemIteratorPtr(new _MySubWNIterator(this,SMDSAbs_Edge));
-  default:
-    MESSAGE("ERROR : Iterator not implemented");
-    return SMDS_ElemIteratorPtr((SMDS_ElemIterator*)NULL);
-  }
-}
-
-SMDSAbs_ElementType SMDS_VolumeVtkNodes::GetType() const
-{
-        return SMDSAbs_Volume;
-}
-
-/*!
- * \brief Return node by its index
- * \param ind - node index
- * \retval const SMDS_MeshNode* - the node
- */
-const SMDS_MeshNode* SMDS_VolumeVtkNodes::GetNode(const int ind) const
-{
-  return 0;
-}
-
-SMDSAbs_EntityType SMDS_VolumeVtkNodes::GetEntityType() const
-{
-  SMDSAbs_EntityType aType = SMDSEntity_Tetra;
-  switch(NbNodes())
-  {
-  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;
-}