// $Header:
using namespace std;
-#include "SMESHDS_Script.ixx"
-#include "SMESHDS_Command.hxx"
-#include "SMESHDS_CommandType.hxx"
-#include "SMESHDS_ListOfCommand.hxx"
+#include "SMESHDS_Script.hxx"
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddNode(const Standard_Integer NewNodeID,
- const Standard_Real x,
- const Standard_Real y,
- const Standard_Real z)
+void SMESHDS_Script::AddNode(int NewNodeID, double x, double y, double z)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddNode);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddNode) {
- com = new SMESHDS_Command(SMESHDS_AddNode);
- myCommands.Append (com);
- }
- }
- com->AddNode (NewNodeID,x,y,z);
+ SMESHDS_Command* com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddNode)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddNode(NewNodeID, x, y, z);
}
-
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddEdge(const Standard_Integer NewEdgeID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2)
+void SMESHDS_Script::AddEdge(int NewEdgeID, int idnode1, int idnode2)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddEdge);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddEdge) {
- com = new SMESHDS_Command(SMESHDS_AddEdge);
- myCommands.Append (com);
- }
- }
- com->AddEdge (NewEdgeID,idnode1,idnode2);
+ SMESHDS_Command* com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddEdge);
+ myCommands.insert(myCommands.end(), com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddEdge)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddEdge);
+ myCommands.insert(myCommands.end(), com);
+ }
+ }
+ com->AddEdge(NewEdgeID, idnode1, idnode2);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddFace(const Standard_Integer NewFaceID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3)
+void SMESHDS_Script::AddFace(int NewFaceID,
+ int idnode1, int idnode2, int idnode3)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddTriangle);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddTriangle) {
- com = new SMESHDS_Command(SMESHDS_AddTriangle);
- myCommands.Append (com);
- }
- }
- com->AddFace (NewFaceID,idnode1,idnode2,idnode3);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddTriangle);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddTriangle)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddTriangle);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddFace(NewFaceID, idnode1, idnode2, idnode3);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddFace(const Standard_Integer NewFaceID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3,
- const Standard_Integer idnode4)
+void SMESHDS_Script::AddFace(int NewFaceID,
+ int idnode1, int idnode2, int idnode3, int idnode4)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddQuadrangle);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddQuadrangle) {
- com = new SMESHDS_Command(SMESHDS_AddQuadrangle);
- myCommands.Append (com);
- }
- }
- com->AddFace (NewFaceID,idnode1,idnode2,idnode3,idnode4);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddQuadrangle);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddQuadrangle)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddQuadrangle);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddFace(NewFaceID, idnode1, idnode2, idnode3, idnode4);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddVolume(const Standard_Integer NewID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3,
- const Standard_Integer idnode4)
+void SMESHDS_Script::AddVolume(int NewID,
+ int idnode1, int idnode2, int idnode3, int idnode4)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddTetrahedron);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddQuadrangle) {
- com = new SMESHDS_Command(SMESHDS_AddQuadrangle);
- myCommands.Append (com);
- }
- }
- com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddTetrahedron);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddTetrahedron)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddTetrahedron);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddVolume(NewID, idnode1, idnode2, idnode3, idnode4);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddVolume(const Standard_Integer NewID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3,
- const Standard_Integer idnode4,
- const Standard_Integer idnode5)
+void SMESHDS_Script::AddVolume(int NewID,
+ int idnode1, int idnode2, int idnode3, int idnode4, int idnode5)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddPyramid);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddPyramid) {
- com = new SMESHDS_Command(SMESHDS_AddPyramid);
- myCommands.Append (com);
- }
- }
- com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4,idnode5);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddPyramid);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddPyramid)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddPyramid);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddVolume(NewID, idnode1, idnode2, idnode3, idnode4, idnode5);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddVolume(const Standard_Integer NewID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3,
- const Standard_Integer idnode4,
- const Standard_Integer idnode5,
- const Standard_Integer idnode6)
+void SMESHDS_Script::AddVolume(int NewID,
+ int idnode1,
+ int idnode2, int idnode3, int idnode4, int idnode5, int idnode6)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddPrism);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddPrism) {
- com = new SMESHDS_Command(SMESHDS_AddPrism);
- myCommands.Append (com);
- }
- }
- com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4,idnode5,idnode6);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddPrism);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddPrism)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddPrism);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddVolume(NewID, idnode1, idnode2, idnode3, idnode4, idnode5, idnode6);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::AddVolume(const Standard_Integer NewID,
- const Standard_Integer idnode1,
- const Standard_Integer idnode2,
- const Standard_Integer idnode3,
- const Standard_Integer idnode4,
- const Standard_Integer idnode5,
- const Standard_Integer idnode6,
- const Standard_Integer idnode7,
- const Standard_Integer idnode8)
+void SMESHDS_Script::AddVolume(int NewID,
+ int idnode1,
+ int idnode2,
+ int idnode3,
+ int idnode4, int idnode5, int idnode6, int idnode7, int idnode8)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_AddHexahedron);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_AddHexahedron) {
- com = new SMESHDS_Command(SMESHDS_AddHexahedron);
- myCommands.Append (com);
- }
- }
- com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4,
- idnode5,idnode6,idnode7,idnode8);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_AddHexahedron);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_AddHexahedron)
+ {
+ com = new SMESHDS_Command(SMESHDS_AddHexahedron);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->AddVolume(NewID, idnode1, idnode2, idnode3, idnode4,
+ idnode5, idnode6, idnode7, idnode8);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::MoveNode(const Standard_Integer NewNodeID,
- const Standard_Real x,
- const Standard_Real y,
- const Standard_Real z)
+void SMESHDS_Script::MoveNode(int NewNodeID, double x, double y, double z)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_MoveNode);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_MoveNode) {
- com = new SMESHDS_Command(SMESHDS_MoveNode);
- myCommands.Append (com);
- }
- }
- com->MoveNode (NewNodeID,x,y,z);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_MoveNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_MoveNode)
+ {
+ com = new SMESHDS_Command(SMESHDS_MoveNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->MoveNode(NewNodeID, x, y, z);
}
-
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::RemoveNode(const Standard_Integer ID)
+void SMESHDS_Script::RemoveNode(int ID)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_RemoveNode);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_RemoveNode) {
- com = new SMESHDS_Command(SMESHDS_RemoveNode);
- myCommands.Append (com);
- }
- }
- com->RemoveNode (ID);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_RemoveNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_RemoveNode)
+ {
+ com = new SMESHDS_Command(SMESHDS_RemoveNode);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->RemoveNode(ID);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
- void SMESHDS_Script::RemoveElement(const Standard_Integer ElementID)
+void SMESHDS_Script::RemoveElement(int ElementID)
{
- Handle(SMESHDS_Command) com;
- if (myCommands.IsEmpty()) {
- com = new SMESHDS_Command(SMESHDS_RemoveElement);
- myCommands.Append (com);
- }
- else {
- com = myCommands.Last();
- if (com->GetType() != SMESHDS_RemoveElement) {
- com = new SMESHDS_Command(SMESHDS_RemoveElement);
- myCommands.Append (com);
- }
- }
- com->RemoveElement (ElementID);
+ SMESHDS_Command * com;
+ if (myCommands.empty())
+ {
+ com = new SMESHDS_Command(SMESHDS_RemoveElement);
+ myCommands.insert(myCommands.end(),com);
+ }
+ else
+ {
+ com = myCommands.back();
+ if (com->GetType() != SMESHDS_RemoveElement)
+ {
+ com = new SMESHDS_Command(SMESHDS_RemoveElement);
+ myCommands.insert(myCommands.end(),com);
+ }
+ }
+ com->RemoveElement(ElementID);
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-void SMESHDS_Script::Clear()
+void SMESHDS_Script::Clear()
{
- myCommands.Clear();
+ myCommands.clear();
}
//=======================================================================
//function :
//purpose :
//=======================================================================
-const SMESHDS_ListOfCommand& SMESHDS_Script::GetCommands()
+const list<SMESHDS_Command*>& SMESHDS_Script::GetCommands()
{
- return myCommands;
+ return myCommands;
}
