-// SMESH SMESHDS : management of mesh data and SMESH document
+// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE
//
-// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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
//
+
+// 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"
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddNode(int NewNodeID, double x, double y, double z)
+void SMESHDS_Command::AddNode(smIdType 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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::MoveNode(int NodeID, double x, double y, double z)
+void SMESHDS_Command::MoveNode(smIdType 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::AddEdge(int NewEdgeID, int idnode1, int idnode2)
+void SMESHDS_Command::Add0DElement(smIdType New0DElementID, smIdType idnode)
{
- 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_Add0DElement)
+ {
+ MESSAGE("SMESHDS_Command::Add0DElement : Bad Type");
+ return;
+ }
+ myIntegers.push_back(New0DElementID);
+ myIntegers.push_back(idnode);
+ myNumber++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddFace(int NewFaceID,
- int idnode1, int idnode2, int idnode3)
+void SMESHDS_Command::AddEdge(smIdType NewEdgeID, smIdType idnode1, smIdType idnode2)
{
- 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_AddEdge)
+ {
+ MESSAGE("SMESHDS_Command::AddEdge : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewEdgeID);
+ myIntegers.push_back(idnode1);
+ myIntegers.push_back(idnode2);
+ myNumber++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddFace(int NewFaceID,
- int idnode1, int idnode2, int idnode3, int idnode4)
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType idnode1, smIdType idnode2, smIdType idnode3)
{
- 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_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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID,
- int idnode1, int idnode2, int idnode3, int idnode4)
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType idnode1, smIdType idnode2, smIdType idnode3, smIdType 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_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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID,
- int idnode1, int idnode2, int idnode3, int idnode4, int idnode5)
+void SMESHDS_Command::AddVolume(smIdType NewVolID,
+ smIdType idnode1, smIdType idnode2, smIdType idnode3, smIdType idnode4)
{
- 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_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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID,
- int idnode1,
- int idnode2, int idnode3, int idnode4, int idnode5, int idnode6)
+void SMESHDS_Command::AddVolume(smIdType NewVolID,
+ smIdType idnode1, smIdType idnode2, smIdType idnode3, smIdType idnode4, smIdType idnode5)
{
- 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_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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID,
- int idnode1,
- int idnode2,
- int idnode3,
- int idnode4, int idnode5, int idnode6, int idnode7, int idnode8)
+void SMESHDS_Command::AddVolume(smIdType NewVolID,
+ smIdType idnode1,
+ smIdType idnode2, smIdType idnode3, smIdType idnode4, smIdType idnode5, smIdType idnode6)
{
- 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_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++;
+}
+
+//=======================================================================
+//function :
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddVolume(smIdType NewVolID,
+ smIdType idnode1,
+ smIdType idnode2,
+ smIdType idnode3,
+ smIdType idnode4, smIdType idnode5, smIdType idnode6, smIdType idnode7, smIdType 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++;
+}
+
+void SMESHDS_Command::AddVolume(smIdType NewVolID,
+ smIdType idnode1,smIdType idnode2,smIdType idnode3,smIdType idnode4,
+ smIdType idnode5, smIdType idnode6, smIdType idnode7, smIdType idnode8,
+ smIdType idnode9, smIdType idnode10, smIdType idnode11, smIdType idnode12)
+{
+ if (myType != SMESHDS_AddHexagonalPrism)
+ {
+ 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);
+ myIntegers.push_back(idnode9);
+ myIntegers.push_back(idnode10);
+ myIntegers.push_back(idnode11);
+ myIntegers.push_back(idnode12);
+ myNumber++;
}
//=======================================================================
//function : AddPolygonalFace
//purpose :
//=======================================================================
-void SMESHDS_Command::AddPolygonalFace (const int ElementID,
- std::vector<int> nodes_ids)
+void SMESHDS_Command::AddPolygonalFace (const smIdType ElementID,
+ const std::vector<smIdType>& nodes_ids)
{
- if (!myType == SMESHDS_AddPolygon) {
+ if ( myType != SMESHDS_AddPolygon) {
MESSAGE("SMESHDS_Command::AddPolygonalFace : Bad Type");
return;
}
myIntegers.push_back(ElementID);
- int i, nbNodes = nodes_ids.size();
+ smIdType i, nbNodes = nodes_ids.size();
+ myIntegers.push_back(nbNodes);
+ for (i = 0; i < nbNodes; i++) {
+ myIntegers.push_back(nodes_ids[i]);
+ }
+
+ myNumber++;
+}
+
+//=======================================================================
+//function : AddQuadPolygonalFace
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddQuadPolygonalFace (const smIdType ElementID,
+ const std::vector<smIdType>& nodes_ids)
+{
+ if ( myType != SMESHDS_AddQuadPolygon) {
+ MESSAGE("SMESHDS_Command::AddQuadraticPolygonalFace : Bad Type");
+ return;
+ }
+ myIntegers.push_back(ElementID);
+
+ smIdType i, nbNodes = nodes_ids.size();
myIntegers.push_back(nbNodes);
for (i = 0; i < nbNodes; i++) {
myIntegers.push_back(nodes_ids[i]);
//function : AddPolyhedralVolume
//purpose :
//=======================================================================
-void SMESHDS_Command::AddPolyhedralVolume (const int ElementID,
- std::vector<int> nodes_ids,
- std::vector<int> quantities)
+void SMESHDS_Command::AddPolyhedralVolume (const smIdType ElementID,
+ const std::vector<smIdType>& nodes_ids,
+ const std::vector<int>& quantities)
{
- if (!myType == SMESHDS_AddPolyhedron) {
+ if ( myType != SMESHDS_AddPolyhedron) {
MESSAGE("SMESHDS_Command::AddPolyhedralVolume : Bad Type");
return;
}
myIntegers.push_back(ElementID);
- int i, nbNodes = nodes_ids.size();
+ smIdType i, nbNodes = nodes_ids.size();
myIntegers.push_back(nbNodes);
for (i = 0; i < nbNodes; i++) {
myIntegers.push_back(nodes_ids[i]);
}
- int nbFaces = quantities.size();
+ smIdType nbFaces = quantities.size();
myIntegers.push_back(nbFaces);
for (i = 0; i < nbFaces; i++) {
myIntegers.push_back(quantities[i]);
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::RemoveNode(int NodeID)
+void SMESHDS_Command::RemoveNode(smIdType 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++;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Command::RemoveElement(int ElementID)
+void SMESHDS_Command::RemoveElement(smIdType 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++;
}
//=======================================================================
//purpose :
//=======================================================================
-void SMESHDS_Command::ChangeElementNodes(int ElementID, int nodes[], int nbnodes)
+void SMESHDS_Command::ChangeElementNodes(smIdType ElementID, smIdType nodes[], smIdType nbnodes)
{
- if (!myType == SMESHDS_ChangeElementNodes)
+ if ( myType != SMESHDS_ChangeElementNodes)
{
MESSAGE("SMESHDS_Command::ChangeElementNodes : Bad Type");
return;
}
myIntegers.push_back(ElementID);
myIntegers.push_back(nbnodes);
- for ( int i = 0; i < nbnodes; i++ )
+ for ( smIdType i = 0; i < nbnodes; i++ )
myIntegers.push_back( nodes[ i ] );
myNumber++;
//function : ChangePolyhedronNodes
//purpose :
//=======================================================================
-void SMESHDS_Command::ChangePolyhedronNodes (const int ElementID,
- std::vector<int> nodes_ids,
- std::vector<int> quantities)
+void SMESHDS_Command::ChangePolyhedronNodes (const smIdType ElementID,
+ const std::vector<smIdType>& nodes_ids,
+ const std::vector<int>& quantities)
{
if (myType != SMESHDS_ChangePolyhedronNodes)
{
}
myIntegers.push_back(ElementID);
- int i, nbNodes = nodes_ids.size();
+ smIdType i, nbNodes = nodes_ids.size();
myIntegers.push_back(nbNodes);
for (i = 0; i < nbNodes; i++) {
myIntegers.push_back(nodes_ids[i]);
//purpose :
//=======================================================================
-void SMESHDS_Command::Renumber (const bool isNodes, const int startID, const int deltaID)
+void SMESHDS_Command::Renumber (const bool isNodes, const smIdType startID, const smIdType deltaID)
{
- if (!myType == SMESHDS_Renumber)
+ if ( myType != SMESHDS_Renumber)
{
MESSAGE("SMESHDS_Command::Renumber : Bad Type");
return;
//=======================================================================
SMESHDS_CommandType SMESHDS_Command::GetType()
{
- return myType;
+ return myType;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-int SMESHDS_Command::GetNumber()
+smIdType SMESHDS_Command::GetNumber()
{
- return myNumber;
+ return myNumber;
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-const list < int >&SMESHDS_Command::GetIndexes()
+const list < smIdType >&SMESHDS_Command::GetIndexes()
{
- return myIntegers;
+ return myIntegers;
}
//=======================================================================
//=======================================================================
const list < double >&SMESHDS_Command::GetCoords()
{
- return myReals;
+ return myReals;
}
//function : AddEdge
//purpose :
//=======================================================================
-void SMESHDS_Command::AddEdge(int NewEdgeID, int n1, int n2, int n12)
+void SMESHDS_Command::AddEdge(smIdType NewEdgeID, smIdType n1, smIdType n2, smIdType n12)
{
- if (!myType == SMESHDS_AddQuadEdge) {
+ if ( myType != SMESHDS_AddQuadEdge) {
MESSAGE("SMESHDS_Command::AddEdge : Bad Type");
return;
}
//function : AddFace
//purpose :
//=======================================================================
-void SMESHDS_Command::AddFace(int NewFaceID,
- int n1, int n2, int n3,
- int n12, int n23, int n31)
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType n1, smIdType n2, smIdType n3,
+ smIdType n12, smIdType n23, smIdType n31)
{
- if (!myType == SMESHDS_AddQuadTriangle) {
+ if ( myType != SMESHDS_AddQuadTriangle) {
MESSAGE("SMESHDS_Command::AddFace : Bad Type");
return;
}
//function : AddFace
//purpose :
//=======================================================================
-void SMESHDS_Command::AddFace(int NewFaceID,
- int n1, int n2, int n3, int n4,
- int n12, int n23, int n34, int n41)
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType n1, smIdType n2, smIdType n3,
+ smIdType n12, smIdType n23, smIdType n31, smIdType nCenter)
{
- if (!myType == SMESHDS_AddQuadQuadrangle) {
+ if ( myType != SMESHDS_AddBiQuadTriangle) {
+ MESSAGE("SMESHDS_Command::AddFace : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewFaceID);
+ myIntegers.push_back(n1);
+ myIntegers.push_back(n2);
+ myIntegers.push_back(n3);
+ myIntegers.push_back(n12);
+ myIntegers.push_back(n23);
+ myIntegers.push_back(n31);
+ myIntegers.push_back(nCenter);
+ myNumber++;
+}
+
+//=======================================================================
+//function : AddFace
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType n1, smIdType n2, smIdType n3, smIdType n4,
+ smIdType n12, smIdType n23, smIdType n34, smIdType n41)
+{
+ if ( myType != SMESHDS_AddQuadQuadrangle) {
MESSAGE("SMESHDS_Command::AddFace : Bad Type");
return;
}
myNumber++;
}
+//=======================================================================
+//function : AddFace
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddFace(smIdType NewFaceID,
+ smIdType n1, smIdType n2, smIdType n3, smIdType n4,
+ smIdType n12, smIdType n23, smIdType n34, smIdType n41, smIdType nCenter)
+{
+ if (myType != SMESHDS_AddBiQuadQuadrangle) {
+ MESSAGE("SMESHDS_Command::AddFace : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewFaceID);
+ myIntegers.push_back(n1);
+ myIntegers.push_back(n2);
+ myIntegers.push_back(n3);
+ myIntegers.push_back(n4);
+ myIntegers.push_back(n12);
+ myIntegers.push_back(n23);
+ myIntegers.push_back(n34);
+ myIntegers.push_back(n41);
+ myIntegers.push_back(nCenter);
+ myNumber++;
+}
+
//=======================================================================
//function : AddVolume
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID, int n1, int n2, int n3, int n4,
- int n12, int n23, int n31,
- int n14, int n24, int n34)
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2, smIdType n3, smIdType n4,
+ smIdType n12, smIdType n23, smIdType n31,
+ smIdType n14, smIdType n24, smIdType n34)
{
- if (!myType == SMESHDS_AddQuadTetrahedron) {
+ if ( myType != SMESHDS_AddQuadTetrahedron) {
MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
return;
}
//function : AddVolume
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID, int n1, int n2,
- int n3, int n4, int n5,
- int n12, int n23, int n34, int n41,
- int n15, int n25, int n35, int n45)
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2,
+ smIdType n3, smIdType n4, smIdType n5,
+ smIdType n12, smIdType n23, smIdType n34, smIdType n41,
+ smIdType n15, smIdType n25, smIdType n35, smIdType n45)
{
- if (!myType == SMESHDS_AddQuadPyramid) {
+ if ( myType != SMESHDS_AddQuadPyramid) {
MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
return;
}
//function : AddVolume
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID, int n1, int n2,
- int n3, int n4, int n5,int n6,
- int n12, int n23, int n31,
- int n45, int n56, int n64,
- int n14, int n25, int n36)
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2,
+ smIdType n3, smIdType n4, smIdType n5,smIdType n6,
+ smIdType n12, smIdType n23, smIdType n31,
+ smIdType n45, smIdType n56, smIdType n64,
+ smIdType n14, smIdType n25, smIdType n36)
{
- if (!myType == SMESHDS_AddQuadPentahedron) {
+ if ( myType != SMESHDS_AddQuadPentahedron) {
MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
return;
}
myIntegers.push_back(n36);
myNumber++;
}
+//=======================================================================
+//function : AddVolume
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2,
+ smIdType n3, smIdType n4, smIdType n5,smIdType n6,
+ smIdType n12, smIdType n23, smIdType n31,
+ smIdType n45, smIdType n56, smIdType n64,
+ smIdType n14, smIdType n25, smIdType n36,
+ smIdType n1245, smIdType n2356, smIdType n1346)
+{
+ if ( myType != SMESHDS_AddBiQuadPentahedron) {
+ MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewVolID);
+ myIntegers.push_back(n1);
+ myIntegers.push_back(n2);
+ myIntegers.push_back(n3);
+ myIntegers.push_back(n4);
+ myIntegers.push_back(n5);
+ myIntegers.push_back(n6);
+ myIntegers.push_back(n12);
+ myIntegers.push_back(n23);
+ myIntegers.push_back(n31);
+ myIntegers.push_back(n45);
+ myIntegers.push_back(n56);
+ myIntegers.push_back(n64);
+ myIntegers.push_back(n14);
+ myIntegers.push_back(n25);
+ myIntegers.push_back(n36);
+ myIntegers.push_back(n1245);
+ myIntegers.push_back(n2356);
+ myIntegers.push_back(n1346);
+ myNumber++;
+}
+
//=======================================================================
//function : AddVolume
//purpose :
//=======================================================================
-void SMESHDS_Command::AddVolume(int NewVolID, int n1, int n2, int n3,
- int n4, int n5, int n6, int n7, int n8,
- int n12, int n23, int n34, int n41,
- int n56, int n67, int n78, int n85,
- int n15, int n26, int n37, int n48)
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2, smIdType n3,
+ smIdType n4, smIdType n5, smIdType n6, smIdType n7, smIdType n8,
+ smIdType n12, smIdType n23, smIdType n34, smIdType n41,
+ smIdType n56, smIdType n67, smIdType n78, smIdType n85,
+ smIdType n15, smIdType n26, smIdType n37, smIdType n48)
{
- if (!myType == SMESHDS_AddQuadHexahedron) {
+ if ( myType != SMESHDS_AddQuadHexahedron) {
MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
return;
}
myNumber++;
}
+//=======================================================================
+//function : AddVolume
+//purpose :
+//=======================================================================
+void SMESHDS_Command::AddVolume(smIdType NewVolID, smIdType n1, smIdType n2, smIdType n3,
+ smIdType n4, smIdType n5, smIdType n6, smIdType n7, smIdType n8,
+ smIdType n12, smIdType n23, smIdType n34, smIdType n41,
+ smIdType n56, smIdType n67, smIdType n78, smIdType n85,
+ smIdType n15, smIdType n26, smIdType n37, smIdType n48,
+ smIdType n1234,smIdType n1256,smIdType n2367,smIdType n3478,
+ smIdType n1458,smIdType n5678,smIdType nCenter)
+{
+ if ( myType != SMESHDS_AddTriQuadHexa) {
+ MESSAGE("SMESHDS_Command::AddVolume : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewVolID);
+ myIntegers.push_back(n1);
+ myIntegers.push_back(n2);
+ myIntegers.push_back(n3);
+ myIntegers.push_back(n4);
+ myIntegers.push_back(n5);
+ myIntegers.push_back(n6);
+ myIntegers.push_back(n7);
+ myIntegers.push_back(n8);
+ myIntegers.push_back(n12);
+ myIntegers.push_back(n23);
+ myIntegers.push_back(n34);
+ myIntegers.push_back(n41);
+ myIntegers.push_back(n56);
+ myIntegers.push_back(n67);
+ myIntegers.push_back(n78);
+ myIntegers.push_back(n85);
+ myIntegers.push_back(n15);
+ myIntegers.push_back(n26);
+ myIntegers.push_back(n37);
+ myIntegers.push_back(n48);
+ myIntegers.push_back(n1234);
+ myIntegers.push_back(n1256);
+ myIntegers.push_back(n2367);
+ myIntegers.push_back(n3478);
+ myIntegers.push_back(n1458);
+ myIntegers.push_back(n5678);
+ myIntegers.push_back(nCenter);
+ myNumber++;
+}
+
+//================================================================================
+/*!
+ * \brief Record adding a Ball
+ */
+//================================================================================
+
+void SMESHDS_Command::AddBall(smIdType NewBallID, smIdType node, double diameter)
+{
+ if ( myType != SMESHDS_AddBall)
+ {
+ MESSAGE("SMESHDS_Command::SMESHDS_AddBall : Bad Type");
+ return;
+ }
+ myIntegers.push_back(NewBallID);
+ myIntegers.push_back(node);
+ myReals.push_back(diameter);
+ myNumber++;
+}
