bos #20256: [CEA 18523] Porting SMESH to int 64 bits

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_AddQuadraticElementDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index d23b066288f8f4dc0a544483baa14a54a0dd881b..937a1f241801e1bf90c6323d43758dd89402f8df 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021  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
@@ -380,6 +380,9 @@ SMESHGUI_AddQuadraticElementDlg::SMESHGUI_AddQuadraticElementDlg( SMESHGUI* theM
   case SMDSEntity_Quad_Penta:
     anElementName = QString("QUADRATIC_PENTAHEDRON");
     break;
+  case SMDSEntity_BiQuad_Penta:
+    anElementName = QString("BIQUADRATIC_PENTAHEDRON");
+    break;
   case SMDSEntity_Quad_Hexa:
     anElementName = QString("QUADRATIC_HEXAHEDRON");
     break;
@@ -543,61 +546,67 @@ void SMESHGUI_AddQuadraticElementDlg::Init()
   case SMDSEntity_Quad_Edge:
     aNumRows = 1;
     myNbCorners = 2;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_edges
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_edges
     break;
   case SMDSEntity_Quad_Triangle:
     aNumRows = 3;
     myNbCorners = 3;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_triangles
     break;
   case SMDSEntity_BiQuad_Triangle:
     aNumRows = 3;
     myNbCorners = 3;
     myNbCenterNodes = 1;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_triangles
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_triangles
     break;
   case SMDSEntity_Quad_Quadrangle:
     aNumRows = 4;
     myNbCorners = 4;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_quadrangles
     break;
   case SMDSEntity_BiQuad_Quadrangle:
     aNumRows = 4;
     myNbCorners = 4;
     myNbCenterNodes = 1;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_quadrangles
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_quadrangles
     break;
   case SMDSEntity_Quad_Polygon:
     aNumRows = 5;
     myNbCorners = 0; // no limit
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_polygons
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_polygons
     break;
   case SMDSEntity_Quad_Tetra:
     aNumRows = 6;
     myNbCorners = 4;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_tetrahedrons
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_tetrahedrons
     break;
   case SMDSEntity_Quad_Pyramid:
     aNumRows = 8;
     myNbCorners = 5;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pyramids
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pyramids
     break;
   case SMDSEntity_Quad_Penta:
     aNumRows = 9;
     myNbCorners = 6;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_pentahedrons
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pentahedrons
+    break;
+  case SMDSEntity_BiQuad_Penta:
+    aNumRows = 9;
+    myNbCorners = 6;
+    myNbMidFaceNodes = 3;
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_pentahedrons
     break;
   case SMDSEntity_Quad_Hexa:
     aNumRows = 12;
     myNbCorners = 8;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_hexahedrons
     break;
   case SMDSEntity_TriQuad_Hexa:
     aNumRows = 12;
     myNbCorners = 8;
     myNbMidFaceNodes = 6;
     myNbCenterNodes = 1;
-    myHelpFileName = "adding_quadratic_elements_page.html#?"; //Adding_hexahedrons
+    myHelpFileName = "adding_quadratic_elements.html#?"; //Adding_hexahedrons
     break;
   default:;
   }
@@ -707,6 +716,7 @@ bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
   case SMDSEntity_Quad_Tetra:
   case SMDSEntity_Quad_Pyramid:
   case SMDSEntity_Quad_Penta:
+  case SMDSEntity_BiQuad_Penta:
   case SMDSEntity_Quad_Hexa:
   case SMDSEntity_TriQuad_Hexa:
     for ( int row = 0; row < myNbCorners; row++ )
@@ -731,7 +741,7 @@ bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
     ReverseConnectivity( anIds, myGeomType, /*toReverse=*/true, /*toVtkOrder=*/false );
 
   int aNumberOfIds = anIds.size();
-  SMESH::long_array_var anArrayOfIdeces = new SMESH::long_array;
+  SMESH::smIdType_array_var anArrayOfIdeces = new SMESH::smIdType_array;
   anArrayOfIdeces->length( aNumberOfIds );
 
   for (int i = 0; i < aNumberOfIds; i++)
@@ -790,6 +800,7 @@ bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
   case SMDSEntity_Quad_Tetra:
   case SMDSEntity_Quad_Pyramid:
   case SMDSEntity_Quad_Penta:
+  case SMDSEntity_BiQuad_Penta:
   case SMDSEntity_Quad_Hexa:
   case SMDSEntity_TriQuad_Hexa:
     anElementType = SMESH::VOLUME;
@@ -830,7 +841,7 @@ bool SMESHGUI_AddQuadraticElementDlg::ClickOnApply()
     }
 
     if ( !aGroupUsed->_is_nil() ) {
-      SMESH::long_array_var anIdList = new SMESH::long_array;
+      SMESH::smIdType_array_var anIdList = new SMESH::smIdType_array;
       anIdList->length( 1 );
       anIdList[0] = anElemId;
       aGroupUsed->Add( anIdList.inout() );
@@ -966,7 +977,7 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
 
   mySimulation->SetVisibility(false);
 
-  // hilight entered nodes
+  // highlight entered nodes
   SMDS_Mesh* aMesh = 0;
   if (myActor)
     aMesh = myActor->GetObject()->GetMesh();
@@ -978,7 +989,7 @@ void SMESHGUI_AddQuadraticElementDlg::onTextChange (const QString& theNewText)
     myCurrentLineEdit = send;
 
   if (aMesh) {
-    TColStd_MapOfInteger newIndices;
+    SVTK_TVtkIDsMap newIndices;
 
     QStringList aListId = theNewText.split(" ", QString::SkipEmptyParts);
     bool allOk = true;
@@ -1068,6 +1079,7 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument()
     case SMDSEntity_Quad_Tetra:
     case SMDSEntity_Quad_Pyramid:
     case SMDSEntity_Quad_Penta:
+    case SMDSEntity_BiQuad_Penta:
     case SMDSEntity_Quad_Hexa:
     case SMDSEntity_TriQuad_Hexa:
       anElementType = SMESH::VOLUME; break;
@@ -1262,7 +1274,7 @@ void SMESHGUI_AddQuadraticElementDlg::enterEvent (QEvent*)
 // purpose  :
 //=================================================================================
 
-void SMESHGUI_AddQuadraticElementDlg::onReverse (int state)
+void SMESHGUI_AddQuadraticElementDlg::onReverse (int /*state*/)
 {
   mySimulation->SetVisibility(false);
   displaySimulation();
@@ -1402,6 +1414,7 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
       aLastColIds  = LastPyramidIds;
       break;
     case SMDSEntity_Quad_Penta:
+    case SMDSEntity_BiQuad_Penta:
       aFirstColIds = FirstPentahedronIds;
       aLastColIds  = LastPentahedronIds;
       break;
@@ -1436,7 +1449,7 @@ void SMESHGUI_AddQuadraticElementDlg::UpdateTable( bool theConersValidity )
 // purpose  :
 //=================================================================================
 
-void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCol )
+void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int /*theRow*/, int /*theCol*/ )
 {
   myCurrentLineEdit = 0;
   displaySimulation();
@@ -1448,7 +1461,7 @@ void SMESHGUI_AddQuadraticElementDlg::onCellDoubleClicked( int theRow, int theCo
 // purpose  :
 //=================================================================================
 
-void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int theRow, int theCol)
+void SMESHGUI_AddQuadraticElementDlg::onCellTextChange(int /*theRow*/, int /*theCol*/)
 {
   myCurrentLineEdit = 0;
   displaySimulation();