X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Script.cxx;h=5a5dac83bee45a40324ae79cea1872a6dc650131;hp=6c702be56ed7c9acf4f6f9102094d2d632ecfcaf;hb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;hpb=bef9beee88cac57394b8dc3bc914381c1a2fff83 diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx index 6c702be56..5a5dac83b 100644 --- a/src/SMESHDS/SMESHDS_Script.cxx +++ b/src/SMESHDS/SMESHDS_Script.cxx @@ -1,304 +1,581 @@ +// Copyright (C) 2007-2015 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, 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_Script.cxx +// Author : Yves FRICAUD, OCC +// Module : SMESH +// +#include "SMESHDS_Script.hxx" +#include + using namespace std; -//============================================================================= -// File : SMESH_Script.cxx -// Created : -// Author : Yves FRICAUD, OCC -// Project : SALOME -// Copyright : OCC 2002 -// $Header: -//============================================================================= -#include "SMESHDS_Script.ixx" -#include "SMESHDS_Command.hxx" -#include "SMESHDS_CommandType.hxx" -#include "SMESHDS_ListOfCommand.hxx" +//======================================================================= +//function : Constructor +//purpose : +//======================================================================= +SMESHDS_Script::SMESHDS_Script(bool theIsEmbeddedMode): + myIsEmbeddedMode(theIsEmbeddedMode) +{ + //cerr << "=========================== myIsEmbeddedMode " << myIsEmbeddedMode << endl; +} //======================================================================= -//function : +//function : Destructor //purpose : //======================================================================= -void SMESHDS_Script::AddNode(const Standard_Integer NewNodeID, - const Standard_Real x, - const Standard_Real y, - const Standard_Real z) +SMESHDS_Script::~SMESHDS_Script() { - 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); + Clear(); } +//======================================================================= +void SMESHDS_Script::SetModified(bool theModified) +{ + myIsModified = theModified; +} //======================================================================= -//function : +bool SMESHDS_Script::IsModified() +{ + return myIsModified; +} + +//======================================================================= +//function : getCommand //purpose : //======================================================================= -void SMESHDS_Script::AddEdge(const Standard_Integer NewEdgeID, - const Standard_Integer idnode1, - const Standard_Integer idnode2) +SMESHDS_Command* SMESHDS_Script::getCommand(const SMESHDS_CommandType aType) { - Handle(SMESHDS_Command) com; - if (myCommands.IsEmpty()) { - com = new SMESHDS_Command(SMESHDS_AddEdge); - myCommands.Append (com); + SMESHDS_Command* com; + if (myCommands.empty()) + { + com = new SMESHDS_Command(aType); + myCommands.insert(myCommands.end(),com); } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_AddEdge) { - com = new SMESHDS_Command(SMESHDS_AddEdge); - myCommands.Append (com); + else + { + com = myCommands.back(); + if (com->GetType() != aType) + { + com = new SMESHDS_Command(aType); + myCommands.insert(myCommands.end(),com); } } - com->AddEdge (NewEdgeID,idnode1,idnode2); + return com; } //======================================================================= //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::AddNode(int NewNodeID, double x, double y, double z) { - Handle(SMESHDS_Command) com; - if (myCommands.IsEmpty()) { - com = new SMESHDS_Command(SMESHDS_AddTriangle); - myCommands.Append (com); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_AddTriangle) { - com = new SMESHDS_Command(SMESHDS_AddTriangle); - myCommands.Append (com); - } + getCommand(SMESHDS_AddNode)->AddNode(NewNodeID, x, y, z); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::Add0DElement (int New0DElementID, int idnode) +{ + if (myIsEmbeddedMode) { + myIsModified = true; + return; } - com->AddFace (NewFaceID,idnode1,idnode2,idnode3); + getCommand(SMESHDS_Add0DElement)->Add0DElement(New0DElementID, idnode); } //======================================================================= //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::AddEdge(int NewEdgeID, int idnode1, int idnode2) { - 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); - } + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - com->AddFace (NewFaceID,idnode1,idnode2,idnode3,idnode4); + getCommand(SMESHDS_AddEdge)->AddEdge(NewEdgeID, idnode1, idnode2); } //======================================================================= //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) { - Handle(SMESHDS_Command) com; - if (myCommands.IsEmpty()) { - com = new SMESHDS_Command(SMESHDS_AddTetrahedron); - myCommands.Append (com); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_AddQuadrangle) { - com = new SMESHDS_Command(SMESHDS_AddQuadrangle); - myCommands.Append (com); - } + getCommand(SMESHDS_AddTriangle)->AddFace(NewFaceID, + idnode1, idnode2, idnode3); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::AddFace(int NewFaceID, + int idnode1, int idnode2, + int idnode3, int idnode4) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_AddPyramid) { - com = new SMESHDS_Command(SMESHDS_AddPyramid); - myCommands.Append (com); - } + getCommand(SMESHDS_AddTetrahedron)->AddVolume(NewID, + idnode1, idnode2, + idnode3, idnode4); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::AddVolume(int NewID, + int idnode1, int idnode2, + int idnode3, int idnode4, int idnode5) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4,idnode5); + 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) -{ - 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); - } +void SMESHDS_Script::AddVolume(int NewID, + int idnode1, int idnode2, int idnode3, + int idnode4, int idnode5, int idnode6) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4,idnode5,idnode6); + getCommand(SMESHDS_AddPrism)->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) -{ - 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); - } +void SMESHDS_Script::AddVolume(int NewID, + int idnode1, int idnode2, int idnode3, int idnode4, + int idnode5, int idnode6, int idnode7, int idnode8) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - com->AddVolume (NewID,idnode1,idnode2,idnode3,idnode4, - idnode5,idnode6,idnode7,idnode8); + getCommand(SMESHDS_AddHexahedron)->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::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) { - Handle(SMESHDS_Command) com; - if (myCommands.IsEmpty()) { - com = new SMESHDS_Command(SMESHDS_MoveNode); - myCommands.Append (com); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_MoveNode) { - com = new SMESHDS_Command(SMESHDS_MoveNode); - myCommands.Append (com); - } + 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; } - com->MoveNode (NewNodeID,x,y,z); + 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); +} //======================================================================= //function : //purpose : //======================================================================= -void SMESHDS_Script::RemoveNode(const Standard_Integer ID) +void SMESHDS_Script::MoveNode(int NewNodeID, double x, double y, double z) { - Handle(SMESHDS_Command) com; - if (myCommands.IsEmpty()) { - com = new SMESHDS_Command(SMESHDS_RemoveNode); - myCommands.Append (com); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_RemoveNode) { - com = new SMESHDS_Command(SMESHDS_RemoveNode); - myCommands.Append (com); - } + getCommand(SMESHDS_MoveNode)->MoveNode(NewNodeID, x, y, z); +} + +//======================================================================= +//function : +//purpose : +//======================================================================= +void SMESHDS_Script::RemoveNode(int ID) +{ + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - 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); + if(myIsEmbeddedMode){ + myIsModified = true; + return; } - else { - com = myCommands.Last(); - if (com->GetType() != SMESHDS_RemoveElement) { - com = new SMESHDS_Command(SMESHDS_RemoveElement); - myCommands.Append (com); - } + 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; } - com->RemoveElement (ElementID); + 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); } //======================================================================= //function : //purpose : //======================================================================= -void SMESHDS_Script::Clear() +void SMESHDS_Script::Clear() { - myCommands.Clear(); + list::iterator anIt = myCommands.begin(); + for (; anIt != myCommands.end(); anIt++) { + delete (*anIt); + } + myCommands.clear(); } //======================================================================= //function : //purpose : //======================================================================= -const SMESHDS_ListOfCommand& SMESHDS_Script::GetCommands() +const list& SMESHDS_Script::GetCommands() { return myCommands; } + + +//******************************************************************** +//***** 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) +{ + 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); +} +