X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHDS%2FSMESHDS_Script.cxx;h=d5eea6ecc1308341d15b5e54b143dca13b1e27db;hp=57baf301c149f7d5de451b4a0f09fe805e123a0a;hb=104ff7b2818ce4d0f8a38d840abd3e5c70190668;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx
index 57baf301c..d5eea6ecc 100644
--- a/src/SMESHDS/SMESHDS_Script.cxx
+++ b/src/SMESHDS/SMESHDS_Script.cxx
@@ -17,7 +17,7 @@
 //  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 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,31 +26,74 @@
 //  Module : SMESH
 //  $Header: 
 
-using namespace std;
 #include "SMESHDS_Script.hxx"
 
+using namespace std;
+
+//=======================================================================
+//function : Constructor
+//purpose  : 
+//=======================================================================
+SMESHDS_Script::SMESHDS_Script(bool theIsEmbeddedMode):
+  myIsEmbeddedMode(theIsEmbeddedMode)
+{}
+
+//=======================================================================
+//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 : 
 //purpose  : 
 //=======================================================================
 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);
 }
 
 //=======================================================================
@@ -59,22 +102,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);
 }
 
 //=======================================================================
@@ -82,24 +114,14 @@ void SMESHDS_Script::AddEdge(int NewEdgeID, int idnode1, int idnode2)
 //purpose  : 
 //=======================================================================
 void SMESHDS_Script::AddFace(int NewFaceID,
-	int idnode1, int idnode2, int idnode3)
+                             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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddTriangle)->AddFace(NewFaceID,
+                                           idnode1, idnode2, idnode3);
 }
 
 //=======================================================================
@@ -107,24 +129,16 @@ void SMESHDS_Script::AddFace(int NewFaceID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Script::AddFace(int NewFaceID,
-	int idnode1, int idnode2, int idnode3, int idnode4)
+                             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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddQuadrangle)->AddFace(NewFaceID,
+                                             idnode1, idnode2,
+                                             idnode3, idnode4);
 }
 
 //=======================================================================
@@ -132,24 +146,16 @@ void SMESHDS_Script::AddFace(int NewFaceID,
 //purpose  : 
 //=======================================================================
 void SMESHDS_Script::AddVolume(int NewID,
-	int idnode1, int idnode2, int idnode3, int idnode4)
+                               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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddTetrahedron)->AddVolume(NewID,
+                                                idnode1, idnode2,
+                                                idnode3, idnode4);
 }
 
 //=======================================================================
@@ -157,24 +163,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 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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddPyramid)->AddVolume(NewID,
+                                            idnode1, idnode2,
+                                            idnode3, idnode4, idnode5);
 }
 
 //=======================================================================
@@ -182,25 +180,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)
+                               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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddPrism)->AddVolume(NewID,
+                                          idnode1, idnode2, idnode3,
+                                          idnode4, idnode5, idnode6);
 }
 
 //=======================================================================
@@ -208,28 +197,45 @@ 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)
+                               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 : AddPolygonalFace
+//purpose  : 
+//=======================================================================
+void SMESHDS_Script::AddPolygonalFace (int NewFaceID, std::vector<int> nodes_ids)
+{
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddPolygon)->AddPolygonalFace(NewFaceID, nodes_ids);
+}
+
+//=======================================================================
+//function : AddPolyhedralVolume
+//purpose  : 
+//=======================================================================
+void SMESHDS_Script::AddPolyhedralVolume (int NewID,
+                                          std::vector<int> nodes_ids,
+                                          std::vector<int> quantities)
 {
-	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);
+  if(myIsEmbeddedMode){
+    myIsModified = true;
+    return;
+  }
+  getCommand(SMESHDS_AddPolyhedron)->AddPolyhedralVolume
+    (NewID, nodes_ids, quantities);
 }
 
 //=======================================================================
@@ -238,22 +244,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);
 }
 
 //=======================================================================
@@ -262,22 +257,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);
 }
 
 //=======================================================================
@@ -286,22 +270,54 @@ 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,
+                                            std::vector<int> nodes_ids,
+                                            std::vector<int> 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 );
 }
 
 //=======================================================================
@@ -310,7 +326,11 @@ void SMESHDS_Script::RemoveElement(int ElementID)
 //=======================================================================
 void SMESHDS_Script::Clear()
 {
-	myCommands.clear();
+  list<SMESHDS_Command*>::iterator anIt = myCommands.begin();
+  for (; anIt != myCommands.end(); anIt++) {
+    delete (*anIt);
+  }
+  myCommands.clear();
 }
 
 //=======================================================================
@@ -319,5 +339,128 @@ void SMESHDS_Script::Clear()
 //=======================================================================
 const list<SMESHDS_Command*>& SMESHDS_Script::GetCommands()
 {
-	return myCommands;
+  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 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 : 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);
+}
+