PR: merged from V5_1_4rc1

[modules/smesh.git] / src / SMESHDS / SMESHDS_Command.cxx

diff --git a/src/SMESHDS/SMESHDS_Command.cxx b/src/SMESHDS/SMESHDS_Command.cxx
index 7de0dc6378ac6f1525856be26b670e5c12f231e6..bbfded7131341f5d545ad1262769749df1e0369c 100644 (file)
--- a/src/SMESHDS/SMESHDS_Command.cxx
+++ b/src/SMESHDS/SMESHDS_Command.cxx
@@ -1,31 +1,31 @@
-//  SMESH SMESHDS : management of mesh data and SMESH document
+//  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
+//
+//  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.
 //
-//  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 
+//  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
 //
+
+//  SMESH SMESHDS : management of mesh data and SMESH document
 //  File   : SMESH_Command.cxx
 //  Author : Yves FRICAUD, OCC
 //  Module : SMESH
 //  $Header: 
-
+//
 #include "SMESHDS_Command.hxx"
 
 #include "utilities.h"
@@ -55,16 +55,16 @@ SMESHDS_Command::~SMESHDS_Command()
 //=======================================================================
 void SMESHDS_Command::AddNode(int NewNodeID, double x, double y, double z)
 {
-       if (!myType == SMESHDS_AddNode)
-       {
-               MESSAGE("SMESHDS_Command::AddNode : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewNodeID);
-       myReals.push_back(x);
-       myReals.push_back(y);
-       myReals.push_back(z);
-       myNumber++;
+        if (!myType == SMESHDS_AddNode)
+        {
+                MESSAGE("SMESHDS_Command::AddNode : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewNodeID);
+        myReals.push_back(x);
+        myReals.push_back(y);
+        myReals.push_back(z);
+        myNumber++;
 }
 
 //=======================================================================
@@ -73,16 +73,32 @@ void SMESHDS_Command::AddNode(int NewNodeID, double x, double y, double z)
 //=======================================================================
 void SMESHDS_Command::MoveNode(int NodeID, double x, double y, double z)
 {
-       if (!myType == SMESHDS_MoveNode)
-       {
-               MESSAGE("SMESHDS_Command::MoveNode : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NodeID);
-       myReals.push_back(x);
-       myReals.push_back(y);
-       myReals.push_back(z);
-       myNumber++;
+        if (!myType == SMESHDS_MoveNode)
+        {
+                MESSAGE("SMESHDS_Command::MoveNode : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NodeID);
+        myReals.push_back(x);
+        myReals.push_back(y);
+        myReals.push_back(z);
+        myNumber++;
+}
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+void SMESHDS_Command::Add0DElement(int New0DElementID, int idnode)
+{
+  if (!myType == SMESHDS_Add0DElement)
+  {
+    MESSAGE("SMESHDS_Command::Add0DElement : Bad Type");
+    return;
+  }
+  myIntegers.push_back(New0DElementID);
+  myIntegers.push_back(idnode);
+  myNumber++;
 }
 
 //=======================================================================
@@ -91,15 +107,15 @@ void SMESHDS_Command::MoveNode(int NodeID, double x, double y, double z)
 //=======================================================================
 void SMESHDS_Command::AddEdge(int NewEdgeID, int idnode1, int idnode2)
 {
-       if (!myType == SMESHDS_AddEdge)
-       {
-               MESSAGE("SMESHDS_Command::AddEdge : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewEdgeID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myNumber++;
+        if (!myType == SMESHDS_AddEdge)
+        {
+                MESSAGE("SMESHDS_Command::AddEdge : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewEdgeID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myNumber++;
 }
 
 //=======================================================================
@@ -107,18 +123,18 @@ void SMESHDS_Command::AddEdge(int NewEdgeID, int idnode1, int idnode2)
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddFace(int NewFaceID,
-       int idnode1, int idnode2, int idnode3)
+        int idnode1, int idnode2, int idnode3)
 {
-       if (!myType == SMESHDS_AddTriangle)
-       {
-               MESSAGE("SMESHDS_Command::AddFace : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewFaceID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myNumber++;
+        if (!myType == SMESHDS_AddTriangle)
+        {
+                MESSAGE("SMESHDS_Command::AddFace : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewFaceID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myNumber++;
 }
 
 //=======================================================================
@@ -126,19 +142,19 @@ void SMESHDS_Command::AddFace(int NewFaceID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddFace(int NewFaceID,
-       int idnode1, int idnode2, int idnode3, int idnode4)
+        int idnode1, int idnode2, int idnode3, int idnode4)
 {
-       if (!myType == SMESHDS_AddQuadrangle)
-       {
-               MESSAGE("SMESHDS_Command::AddFace : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewFaceID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myIntegers.push_back(idnode4);
-       myNumber++;
+        if (!myType == SMESHDS_AddQuadrangle)
+        {
+                MESSAGE("SMESHDS_Command::AddFace : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewFaceID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myIntegers.push_back(idnode4);
+        myNumber++;
 }
 
 //=======================================================================
@@ -146,19 +162,19 @@ void SMESHDS_Command::AddFace(int NewFaceID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddVolume(int NewVolID,
-       int idnode1, int idnode2, int idnode3, int idnode4)
+        int idnode1, int idnode2, int idnode3, int idnode4)
 {
-       if (!myType == SMESHDS_AddTetrahedron)
-       {
-               MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewVolID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myIntegers.push_back(idnode4);
-       myNumber++;
+        if (!myType == SMESHDS_AddTetrahedron)
+        {
+                MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewVolID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myIntegers.push_back(idnode4);
+        myNumber++;
 }
 
 //=======================================================================
@@ -166,20 +182,20 @@ void SMESHDS_Command::AddVolume(int NewVolID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddVolume(int NewVolID,
-       int idnode1, int idnode2, int idnode3, int idnode4, int idnode5)
+        int idnode1, int idnode2, int idnode3, int idnode4, int idnode5)
 {
-       if (!myType == SMESHDS_AddPyramid)
-       {
-               MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewVolID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myIntegers.push_back(idnode4);
-       myIntegers.push_back(idnode5);
-       myNumber++;
+        if (!myType == SMESHDS_AddPyramid)
+        {
+                MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewVolID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myIntegers.push_back(idnode4);
+        myIntegers.push_back(idnode5);
+        myNumber++;
 }
 
 //=======================================================================
@@ -187,22 +203,22 @@ void SMESHDS_Command::AddVolume(int NewVolID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddVolume(int NewVolID,
-       int idnode1,
-       int idnode2, int idnode3, int idnode4, int idnode5, int idnode6)
+        int idnode1,
+        int idnode2, int idnode3, int idnode4, int idnode5, int idnode6)
 {
-       if (!myType == SMESHDS_AddPrism)
-       {
-               MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewVolID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myIntegers.push_back(idnode4);
-       myIntegers.push_back(idnode5);
-       myIntegers.push_back(idnode6);
-       myNumber++;
+        if (!myType == SMESHDS_AddPrism)
+        {
+                MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewVolID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myIntegers.push_back(idnode4);
+        myIntegers.push_back(idnode5);
+        myIntegers.push_back(idnode6);
+        myNumber++;
 }
 
 //=======================================================================
@@ -210,26 +226,26 @@ void SMESHDS_Command::AddVolume(int NewVolID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Command::AddVolume(int NewVolID,
-       int idnode1,
-       int idnode2,
-       int idnode3,
-       int idnode4, int idnode5, int idnode6, int idnode7, int idnode8)
+        int idnode1,
+        int idnode2,
+        int idnode3,
+        int idnode4, int idnode5, int idnode6, int idnode7, int idnode8)
 {
-       if (!myType == SMESHDS_AddHexahedron)
-       {
-               MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NewVolID);
-       myIntegers.push_back(idnode1);
-       myIntegers.push_back(idnode2);
-       myIntegers.push_back(idnode3);
-       myIntegers.push_back(idnode4);
-       myIntegers.push_back(idnode5);
-       myIntegers.push_back(idnode6);
-       myIntegers.push_back(idnode7);
-       myIntegers.push_back(idnode8);
-       myNumber++;
+        if (!myType == SMESHDS_AddHexahedron)
+        {
+                MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NewVolID);
+        myIntegers.push_back(idnode1);
+        myIntegers.push_back(idnode2);
+        myIntegers.push_back(idnode3);
+        myIntegers.push_back(idnode4);
+        myIntegers.push_back(idnode5);
+        myIntegers.push_back(idnode6);
+        myIntegers.push_back(idnode7);
+        myIntegers.push_back(idnode8);
+        myNumber++;
 }
 
 //=======================================================================
@@ -289,13 +305,13 @@ void SMESHDS_Command::AddPolyhedralVolume (const int        ElementID,
 //=======================================================================
 void SMESHDS_Command::RemoveNode(int NodeID)
 {
-       if (!myType == SMESHDS_RemoveNode)
-       {
-               MESSAGE("SMESHDS_Command::RemoveNode : Bad Type");
-               return;
-       }
-       myIntegers.push_back(NodeID);
-       myNumber++;
+        if (!myType == SMESHDS_RemoveNode)
+        {
+                MESSAGE("SMESHDS_Command::RemoveNode : Bad Type");
+                return;
+        }
+        myIntegers.push_back(NodeID);
+        myNumber++;
 }
 
 //=======================================================================
@@ -304,13 +320,13 @@ void SMESHDS_Command::RemoveNode(int NodeID)
 //=======================================================================
 void SMESHDS_Command::RemoveElement(int ElementID)
 {
-       if (!myType == SMESHDS_RemoveElement)
-       {
-               MESSAGE("SMESHDS_Command::RemoveElement : Bad Type");
-               return;
-       }
-       myIntegers.push_back(ElementID);
-       myNumber++;
+        if (!myType == SMESHDS_RemoveElement)
+        {
+                MESSAGE("SMESHDS_Command::RemoveElement : Bad Type");
+                return;
+        }
+        myIntegers.push_back(ElementID);
+        myNumber++;
 }
 
 //=======================================================================
@@ -387,7 +403,7 @@ void SMESHDS_Command::Renumber (const bool isNodes, const int startID, const int
 //=======================================================================
 SMESHDS_CommandType SMESHDS_Command::GetType()
 {
-       return myType;
+        return myType;
 }
 
 //=======================================================================
@@ -396,7 +412,7 @@ SMESHDS_CommandType SMESHDS_Command::GetType()
 //=======================================================================
 int SMESHDS_Command::GetNumber()
 {
-       return myNumber;
+        return myNumber;
 }
 
 //=======================================================================
@@ -405,7 +421,7 @@ int SMESHDS_Command::GetNumber()
 //=======================================================================
 const list < int >&SMESHDS_Command::GetIndexes()
 {
-       return myIntegers;
+        return myIntegers;
 }
 
 //=======================================================================
@@ -414,7 +430,7 @@ const list < int >&SMESHDS_Command::GetIndexes()
 //=======================================================================
 const list < double >&SMESHDS_Command::GetCoords()
 {
-       return myReals;
+        return myReals;
 }