X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Script.cxx;h=d715a20b40f4d6f3f2b896bc82e2538466e451db;hb=e57d64d3910c1a5f0eca72ee7244d32873495517;hp=cc969b748471f5b468d522949ea1db61d938cd79;hpb=7b70ad87bf8f5c46b2751f94cd196932b9ae7122;p=modules%2Fsmesh.git diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx index cc969b748..d715a20b4 100644 --- a/src/SMESHDS/SMESHDS_Script.cxx +++ b/src/SMESHDS/SMESHDS_Script.cxx @@ -1,32 +1,89 @@ -// SMESH SMESHDS : management of mesh data and SMESH document +// Copyright (C) 2007-2013 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_Script.cxx // Author : Yves FRICAUD, OCC // Module : SMESH -// $Header: - +// #include "SMESHDS_Script.hxx" +#include + +using namespace std; + +//======================================================================= +//function : Constructor +//purpose : +//======================================================================= +SMESHDS_Script::SMESHDS_Script(bool theIsEmbeddedMode): + myIsEmbeddedMode(theIsEmbeddedMode) +{ + //cerr << "=========================== myIsEmbeddedMode " << myIsEmbeddedMode << endl; +} + +//======================================================================= +//function : Destructor +//purpose : +//======================================================================= +SMESHDS_Script::~SMESHDS_Script() +{ + Clear(); +} + +//======================================================================= +void SMESHDS_Script::SetModified(bool theModified) +{ + myIsModified = theModified; +} + +//======================================================================= +bool SMESHDS_Script::IsModified() +{ + return myIsModified; +} + +//======================================================================= +//function : getCommand +//purpose : +//======================================================================= +SMESHDS_Command* SMESHDS_Script::getCommand(const SMESHDS_CommandType aType) +{ + 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); + } + } + return com; +} //======================================================================= //function : @@ -34,22 +91,24 @@ //======================================================================= void SMESHDS_Script::AddNode(int NewNodeID, double x, double y, double 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddNode)->AddNode(NewNodeID, x, y, z); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::Add0DElement (int New0DElementID, int idnode) +{ + if (myIsEmbeddedMode) { + myIsModified = true; + return; + } + getCommand(SMESHDS_Add0DElement)->Add0DElement(New0DElementID, idnode); } //======================================================================= @@ -58,22 +117,11 @@ void SMESHDS_Script::AddNode(int NewNodeID, double x, double y, double z) //======================================================================= void SMESHDS_Script::AddEdge(int NewEdgeID, int idnode1, int 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddEdge)->AddEdge(NewEdgeID, idnode1, idnode2); } //======================================================================= @@ -81,24 +129,14 @@ void SMESHDS_Script::AddEdge(int NewEdgeID, int idnode1, int idnode2) //purpose : //======================================================================= void SMESHDS_Script::AddFace(int NewFaceID, - int idnode1, int idnode2, int 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); + int idnode1, int idnode2, int idnode3) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddTriangle)->AddFace(NewFaceID, + idnode1, idnode2, idnode3); } //======================================================================= @@ -106,24 +144,16 @@ void SMESHDS_Script::AddFace(int NewFaceID, //purpose : //======================================================================= void SMESHDS_Script::AddFace(int NewFaceID, - int idnode1, int idnode2, int idnode3, int 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); + int idnode1, int idnode2, + int idnode3, int idnode4) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadrangle)->AddFace(NewFaceID, + idnode1, idnode2, + idnode3, idnode4); } //======================================================================= @@ -131,24 +161,16 @@ void SMESHDS_Script::AddFace(int NewFaceID, //purpose : //======================================================================= void SMESHDS_Script::AddVolume(int NewID, - int idnode1, int idnode2, int idnode3, int 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); + int idnode1, int idnode2, + int idnode3, int idnode4) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddTetrahedron)->AddVolume(NewID, + idnode1, idnode2, + idnode3, idnode4); } //======================================================================= @@ -156,24 +178,16 @@ void SMESHDS_Script::AddVolume(int NewID, //purpose : //======================================================================= void SMESHDS_Script::AddVolume(int NewID, - int idnode1, int idnode2, int idnode3, int idnode4, int 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); + int idnode1, int idnode2, + int idnode3, int idnode4, int idnode5) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddPyramid)->AddVolume(NewID, + idnode1, idnode2, + idnode3, idnode4, idnode5); } //======================================================================= @@ -181,25 +195,16 @@ void SMESHDS_Script::AddVolume(int NewID, //purpose : //======================================================================= void SMESHDS_Script::AddVolume(int NewID, - int idnode1, - int idnode2, int idnode3, int idnode4, int idnode5, int 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); + int idnode1, int idnode2, int idnode3, + int idnode4, int idnode5, int idnode6) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddPrism)->AddVolume(NewID, + idnode1, idnode2, idnode3, + idnode4, idnode5, idnode6); } //======================================================================= @@ -207,28 +212,76 @@ void SMESHDS_Script::AddVolume(int NewID, //purpose : //======================================================================= void SMESHDS_Script::AddVolume(int NewID, - int idnode1, - int idnode2, - int idnode3, - int idnode4, int idnode5, int idnode6, int idnode7, int 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); + int idnode1, int idnode2, int idnode3, int idnode4, + int idnode5, int idnode6, int idnode7, int idnode8) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddHexahedron)->AddVolume(NewID, + idnode1, idnode2, idnode3, idnode4, + idnode5, idnode6, idnode7, idnode8); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::AddVolume(int NewVolID, int idnode1, int idnode2, int idnode3, + int idnode4, int idnode5, int idnode6, int idnode7, int idnode8, + int idnode9, int idnode10, int idnode11, int idnode12) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddHexagonalPrism)->AddVolume(NewVolID, + idnode1, idnode2, idnode3, idnode4, + idnode5, idnode6, idnode7, idnode8, + idnode9, idnode10, idnode11, idnode12); +} + +//======================================================================= +//function : AddPolygonalFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddPolygonalFace (int NewFaceID, const std::vector& nodes_ids) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddPolygon)->AddPolygonalFace(NewFaceID, nodes_ids); +} + +//======================================================================= +//function : AddPolyhedralVolume +//purpose : +//======================================================================= +void SMESHDS_Script::AddPolyhedralVolume (int NewID, + const std::vector& nodes_ids, + const std::vector& quantities) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddPolyhedron)->AddPolyhedralVolume + (NewID, nodes_ids, quantities); +} + +//======================================================================= +//function : AddBall +//purpose : Record adding a Ball +//======================================================================= + +void SMESHDS_Script::AddBall(int NewBallID, int node, double diameter) +{ + if ( myIsEmbeddedMode ) + myIsModified = true; + else + getCommand(SMESHDS_AddBall)->AddBall(NewBallID, node, diameter); } //======================================================================= @@ -237,22 +290,11 @@ void SMESHDS_Script::AddVolume(int NewID, //======================================================================= void SMESHDS_Script::MoveNode(int NewNodeID, double x, double y, double 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_MoveNode)->MoveNode(NewNodeID, x, y, z); } //======================================================================= @@ -261,22 +303,11 @@ void SMESHDS_Script::MoveNode(int NewNodeID, double x, double y, double z) //======================================================================= void SMESHDS_Script::RemoveNode(int 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_RemoveNode)->RemoveNode(ID); } //======================================================================= @@ -285,22 +316,68 @@ void SMESHDS_Script::RemoveNode(int ID) //======================================================================= void SMESHDS_Script::RemoveElement(int 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_RemoveElement)->RemoveElement(ElementID); +} + +//======================================================================= +//function : ChangeElementNodes +//purpose : +//======================================================================= + +void SMESHDS_Script::ChangeElementNodes(int ElementID, int nodes[], int nbnodes) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_ChangeElementNodes)->ChangeElementNodes( ElementID, nodes, nbnodes ); +} + +//======================================================================= +//function : ChangePolyhedronNodes +//purpose : +//======================================================================= +void SMESHDS_Script::ChangePolyhedronNodes (const int ElementID, + const std::vector& nodes_ids, + const std::vector& quantities) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_ChangePolyhedronNodes)->ChangePolyhedronNodes + (ElementID, nodes_ids, quantities); +} + +//======================================================================= +//function : Renumber +//purpose : +//======================================================================= +void SMESHDS_Script::Renumber (const bool isNodes, const int startID, const int deltaID) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_Renumber)->Renumber( isNodes, startID, deltaID ); +} + +//======================================================================= +//function : ClearMesh +//purpose : +//======================================================================= +void SMESHDS_Script::ClearMesh () +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + Clear();// previous commands become useless to reproduce on client side + getCommand(SMESHDS_ClearAll); } //======================================================================= @@ -309,7 +386,11 @@ void SMESHDS_Script::RemoveElement(int ElementID) //======================================================================= void SMESHDS_Script::Clear() { - myCommands.clear(); + list::iterator anIt = myCommands.begin(); + for (; anIt != myCommands.end(); anIt++) { + delete (*anIt); + } + myCommands.clear(); } //======================================================================= @@ -318,14 +399,183 @@ void SMESHDS_Script::Clear() //======================================================================= const list& SMESHDS_Script::GetCommands() { - return myCommands; + return myCommands; } -/** - * Add UpdateAll command to the log of this mesh. Once interpreted by the - * graphical client it will (re)draw the full mesh. - */ -void SMESHDS_Script::UpdateAll() + +//******************************************************************** +//***** Methods for quadratic elements ****** +//******************************************************************** + +//======================================================================= +//function : AddEdge +//purpose : +//======================================================================= +void SMESHDS_Script::AddEdge(int NewEdgeID, int n1, int n2, int n12) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadEdge)->AddEdge(NewEdgeID, n1, n2, n12); +} + +//======================================================================= +//function : AddFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3, + int n12, int n23, int n31) { - myCommands.insert(myCommands.end(), new SMESHDS_Command(SMESHDS_UpdateAll)); + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadTriangle)->AddFace(NewFaceID, n1, n2, n3, + n12, n23, n31); } + +//======================================================================= +//function : AddFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3, + int n12, int n23, int n31, int nCenter) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddBiQuadTriangle)->AddFace(NewFaceID, n1, n2, n3, + n12, n23, n31, nCenter); +} + +//======================================================================= +//function : AddFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3, int n4, + int n12, int n23, int n34, int n41) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadQuadrangle)->AddFace(NewFaceID, n1, n2, n3, n4, + n12, n23, n34, n41); +} + +//======================================================================= +//function : AddFace +//purpose : +//======================================================================= +void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3, int n4, + int n12, int n23, int n34, int n41, int nCenter) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddBiQuadQuadrangle)->AddFace(NewFaceID, n1, n2, n3, n4, + n12, n23, n34, n41, nCenter); +} + +//======================================================================= +//function : AddVolume +//purpose : +//======================================================================= +void SMESHDS_Script::AddVolume(int NewVolID, int n1, int n2, int n3, int n4, + int n12, int n23, int n31, + int n14, int n24, int n34) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadTetrahedron)->AddVolume(NewVolID, n1, n2, n3, n4, + n12, n23, n31, + n14, n24, n34); +} + +//======================================================================= +//function : AddVolume +//purpose : +//======================================================================= +void SMESHDS_Script::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) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadPyramid)->AddVolume(NewVolID, n1, n2, n3, n4, n5, + n12, n23, n34, n41, + n15, n25, n35, n45); +} + +//======================================================================= +//function : AddVolume +//purpose : +//======================================================================= +void SMESHDS_Script::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) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadPentahedron)->AddVolume(NewVolID, n1,n2,n3,n4,n5,n6, + n12, n23, n31, + n45, n56, n64, + n14, n25, n36); +} + +//======================================================================= +//function : AddVolume +//purpose : +//======================================================================= +void SMESHDS_Script::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) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddQuadHexahedron)->AddVolume(NewVolID, n1, n2, n3, n4, + n5, n6, n7, n8, + n12, n23, n34, n41, + n56, n67, n78, n85, + n15, n26, n37, n48); +} + +//======================================================================= +//function : AddVolume +//purpose : +//======================================================================= +void SMESHDS_Script::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, + int n1234,int n1256,int n2367,int n3478, + int n1458,int n5678,int nCenter) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; + } + getCommand(SMESHDS_AddTriQuadHexa)->AddVolume(NewVolID, n1, n2, n3, n4, + n5, n6, n7, n8, + n12, n23, n34, n41, + n56, n67, n78, n85, + n15, n26, n37, n48, + n1234, n1256, n2367, n3478, + n1458, n5678, nCenter); +} +