X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Script.cxx;h=369ab4697cbe43cb4641553849c6ec89ccc0bb3d;hp=9a9d8fed8c5e5450c4a55be89e54a6438495d041;hb=2387bfa403855b82751bf9f122295b1fc6923a18;hpb=4791f5b30ea7a9c1247aa551750dc71cb83b99aa diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx index 9a9d8fed8..369ab4697 100644 --- a/src/SMESHDS/SMESHDS_Script.cxx +++ b/src/SMESHDS/SMESHDS_Script.cxx @@ -26,298 +26,222 @@ // Module : SMESH // $Header: +#include "SMESHDS_Script.hxx" + using namespace std; -#include "SMESHDS_Script.ixx" -#include "SMESHDS_Command.hxx" -#include "SMESHDS_CommandType.hxx" -#include "SMESHDS_ListOfCommand.hxx" //======================================================================= -//function : +//function : getCommand //purpose : //======================================================================= -void SMESHDS_Script::AddNode(const Standard_Integer NewNodeID, - const Standard_Real x, - const Standard_Real y, - const Standard_Real z) +SMESHDS_Command* SMESHDS_Script::getCommand(const SMESHDS_CommandType aType) { - 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); + SMESHDS_Command* com; + if (myCommands.empty()) + { + com = new SMESHDS_Command(aType); + myCommands.insert(myCommands.end(),com); + } + else + { + com = myCommands.back(); + if (com->GetType() != aType) + { + com = new SMESHDS_Command(aType); + myCommands.insert(myCommands.end(),com); } } - com->AddNode (NewNodeID,x,y,z); + return com; } - //======================================================================= //function : //purpose : //======================================================================= -void SMESHDS_Script::AddEdge(const Standard_Integer NewEdgeID, - const Standard_Integer idnode1, - const Standard_Integer idnode2) +void SMESHDS_Script::AddNode(int NewNodeID, double x, double y, double z) { - 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); + getCommand(SMESHDS_AddNode)->AddNode(NewNodeID, x, y, z); } //======================================================================= //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::AddEdge(int NewEdgeID, int idnode1, int idnode2) { - 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); + getCommand(SMESHDS_AddEdge)->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, - const Standard_Integer idnode4) +void SMESHDS_Script::AddFace(int NewFaceID, + int idnode1, int idnode2, int idnode3) { - 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); + getCommand(SMESHDS_AddTriangle)->AddFace(NewFaceID, + idnode1, idnode2, idnode3); } //======================================================================= //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::AddFace(int NewFaceID, + 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); + getCommand(SMESHDS_AddQuadrangle)->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, - const Standard_Integer idnode5) +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_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); + getCommand(SMESHDS_AddTetrahedron)->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, - const Standard_Integer idnode6) +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_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); + getCommand(SMESHDS_AddPyramid)->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, - 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) { - 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); + getCommand(SMESHDS_AddPrism)->AddVolume(NewID, + idnode1, idnode2, idnode3, + idnode4, idnode5, idnode6); } //======================================================================= //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::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_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); + getCommand(SMESHDS_AddHexahedron)->AddVolume(NewID, + idnode1, idnode2, idnode3, idnode4, + idnode5, idnode6, idnode7, idnode8); +} + +//======================================================================= +//function : AddPolygonalFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddPolygonalFace (int NewFaceID, std::vector nodes_ids) +{ + getCommand(SMESHDS_AddPolygon)->AddPolygonalFace(NewFaceID, nodes_ids); +} + +//======================================================================= +//function : AddPolyhedralVolume +//purpose : +//======================================================================= +void SMESHDS_Script::AddPolyhedralVolume (int NewID, + std::vector nodes_ids, + std::vector quantities) +{ + getCommand(SMESHDS_AddPolyhedron)->AddPolyhedralVolume + (NewID, nodes_ids, quantities); } +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::MoveNode(int NewNodeID, double x, double y, double z) +{ + getCommand(SMESHDS_MoveNode)->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); + getCommand(SMESHDS_RemoveNode)->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); + getCommand(SMESHDS_RemoveElement)->RemoveElement(ElementID); +} + +//======================================================================= +//function : ChangeElementNodes +//purpose : +//======================================================================= + +void SMESHDS_Script::ChangeElementNodes(int ElementID, int nodes[], int nbnodes) +{ + getCommand(SMESHDS_ChangeElementNodes)->ChangeElementNodes( ElementID, nodes, nbnodes ); +} + +//======================================================================= +//function : ChangePolyhedronNodes +//purpose : +//======================================================================= +void SMESHDS_Script::ChangePolyhedronNodes (const int ElementID, + std::vector nodes_ids, + std::vector quantities) +{ + getCommand(SMESHDS_ChangePolyhedronNodes)->ChangePolyhedronNodes + (ElementID, nodes_ids, quantities); +} + +//======================================================================= +//function : Renumber +//purpose : +//======================================================================= + +void SMESHDS_Script::Renumber (const bool isNodes, const int startID, const int deltaID) +{ + getCommand(SMESHDS_Renumber)->Renumber( isNodes, startID, deltaID ); } //======================================================================= //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_Script::GetCommands() { - return myCommands; + return myCommands; }