0022100: EDF 2413 SMESH: Take into account TRIA7

diff --git a/src/SMESHDS/SMESHDS_Command.cxx b/src/SMESHDS/SMESHDS_Command.cxx
index cd779a8d6b16553a01630e8d399bb4cbb99b6474..b6077f90041155c8f076f666f32298fc8fe36356 100644 (file)
--- a/src/SMESHDS/SMESHDS_Command.cxx
+++ b/src/SMESHDS/SMESHDS_Command.cxx
@@ -502,6 +502,29 @@ void SMESHDS_Command::AddFace(int NewFaceID,
   myNumber++;
 }
 
   myNumber++;
 }
 

+//=======================================================================
+//function : AddFace
+//purpose  : 
+//=======================================================================
+void SMESHDS_Command::AddFace(int NewFaceID,
+                              int n1, int n2, int n3,
+                              int n12, int n23, int n31, int nCenter)
+{
+  if (!myType == SMESHDS_AddBiQuadTriangle) {
+    MESSAGE("SMESHDS_Command::AddFace : Bad Type");
+    return;
+  }
+  myIntegers.push_back(NewFaceID);
+  myIntegers.push_back(n1);
+  myIntegers.push_back(n2);
+  myIntegers.push_back(n3);
+  myIntegers.push_back(n12);
+  myIntegers.push_back(n23);
+  myIntegers.push_back(n31);
+  myIntegers.push_back(nCenter);
+  myNumber++;
+}
+

 //=======================================================================
 //function : AddFace
 //purpose  : 
 //=======================================================================
 //function : AddFace
 //purpose  : 

diff --git a/src/SMESHDS/SMESHDS_Command.hxx b/src/SMESHDS/SMESHDS_Command.hxx
index 1ef1d75fb7ff37e433bb89887404e7c687012006..71340f0b66e05b683747b51524adc1ab056aaaee 100644 (file)
--- a/src/SMESHDS/SMESHDS_Command.hxx
+++ b/src/SMESHDS/SMESHDS_Command.hxx
@@ -65,6 +65,8 @@ class SMESHDS_EXPORT SMESHDS_Command
         void AddEdge(int NewEdgeID, int n1, int n2, int n12);
         void AddFace(int NewFaceID, int n1, int n2, int n3,
                      int n12, int n23, int n31);
         void AddEdge(int NewEdgeID, int n1, int n2, int n12);
         void AddFace(int NewFaceID, int n1, int n2, int n3,
                      int n12, int n23, int n31);

+        void AddFace(int NewFaceID, int n1, int n2, int n3,
+                     int n12, int n23, int n31, int nCenter);

         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
                      int n12, int n23, int n34, int n41);
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
                      int n12, int n23, int n34, int n41);
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,

diff --git a/src/SMESHDS/SMESHDS_CommandType.hxx b/src/SMESHDS/SMESHDS_CommandType.hxx
index b5f1d682b8ba4375ba18e949362e7743acd0b04f..1bceb33da180424a7dc42bf04a3d7b174a2032fd 100644 (file)
--- a/src/SMESHDS/SMESHDS_CommandType.hxx
+++ b/src/SMESHDS/SMESHDS_CommandType.hxx
@@ -45,7 +45,7 @@ enum SMESHDS_CommandType {
   SMESHDS_ChangePolyhedronNodes,
   SMESHDS_Renumber,
   SMESHDS_ClearAll,
   SMESHDS_ChangePolyhedronNodes,
   SMESHDS_Renumber,
   SMESHDS_ClearAll,

-  // special types for quadratic elements
+  // quadratic elements

   SMESHDS_AddQuadEdge,
   SMESHDS_AddQuadTriangle,
   SMESHDS_AddQuadQuadrangle,
   SMESHDS_AddQuadEdge,
   SMESHDS_AddQuadTriangle,
   SMESHDS_AddQuadQuadrangle,


@@ -55,6 +55,7 @@ enum SMESHDS_CommandType {
   SMESHDS_AddQuadHexahedron,
   //
   SMESHDS_Add0DElement,
   SMESHDS_AddQuadHexahedron,
   //
   SMESHDS_Add0DElement,

+  SMESHDS_AddBiQuadTriangle,

   SMESHDS_AddBiQuadQuadrangle,
   SMESHDS_AddTriQuadHexa,
   SMESHDS_AddHexagonalPrism,
   SMESHDS_AddBiQuadQuadrangle,
   SMESHDS_AddTriQuadHexa,
   SMESHDS_AddHexagonalPrism,

diff --git a/src/SMESHDS/SMESHDS_Script.cxx b/src/SMESHDS/SMESHDS_Script.cxx
index 186bab1e8904a4c8676f4887fb506e7b0e6e82a1..d715a20b40f4d6f3f2b896bc82e2538466e451db 100644 (file)
--- a/src/SMESHDS/SMESHDS_Script.cxx
+++ b/src/SMESHDS/SMESHDS_Script.cxx
@@ -435,6 +435,21 @@ void SMESHDS_Script::AddFace(int NewFaceID, int n1, int n2, int n3,
                                                n12, n23, n31);
 }
 
                                                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  : 
 //=======================================================================
 //function : AddFace
 //purpose  : 

diff --git a/src/SMESHDS/SMESHDS_Script.hxx b/src/SMESHDS/SMESHDS_Script.hxx
index c801fc7c65ef9e392f2cfa1f56f3be5da6992099..f7c2a9b1826ac7925ca93fd29d9e69b771187479 100644 (file)
--- a/src/SMESHDS/SMESHDS_Script.hxx
+++ b/src/SMESHDS/SMESHDS_Script.hxx
@@ -73,6 +73,8 @@ class SMESHDS_EXPORT SMESHDS_Script
         void AddEdge(int NewEdgeID, int n1, int n2, int n12);
         void AddFace(int NewFaceID, int n1, int n2, int n3,
                      int n12, int n23, int n31);
         void AddEdge(int NewEdgeID, int n1, int n2, int n12);
         void AddFace(int NewFaceID, int n1, int n2, int n3,
                      int n12, int n23, int n31);

+        void AddFace(int NewFaceID, int n1, int n2, int n3,
+                     int n12, int n23, int n31, int nCenter);

         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
                      int n12, int n23, int n34, int n41);
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,
                      int n12, int n23, int n34, int n41);
         void AddFace(int NewFaceID, int n1, int n2, int n3, int n4,