From 9af675c36d5be1f00ab28a82b5b98c6158d1dd99 Mon Sep 17 00:00:00 2001 From: msv Date: Tue, 11 Apr 2006 07:24:27 +0000 Subject: [PATCH] Finishing improvement IPAL12061: rename element order from Square to Quadratic --- idl/SMESH_Mesh.idl | 2 +- src/SMESH/SMESH_Mesh.cxx | 18 +++++++++--------- src/SMESH/SMESH_Mesh.hxx | 2 +- src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx | 18 +++++++++--------- src/SMESHGUI/SMESH_msg_en.po | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/idl/SMESH_Mesh.idl b/idl/SMESH_Mesh.idl index 5ebb9115c..10ee91af6 100644 --- a/idl/SMESH_Mesh.idl +++ b/idl/SMESH_Mesh.idl @@ -118,7 +118,7 @@ module SMESH enum ElementOrder { ORDER_ANY, /*! entities of any order */ ORDER_LINEAR, /*! entities of 1st order */ - ORDER_SQUARE /*! entities of 2nd order */ + ORDER_QUADRATIC /*! entities of 2nd order */ }; /*! diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 340682ea0..1426f061d 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -1000,7 +1000,7 @@ int SMESH_Mesh::NbEdges(ElementOrder order) throw(SALOME_Exception) while (it->more()) { const SMDS_MeshEdge* cur = it->next(); if ( order == ORDER_LINEAR && !cur->IsQuadratic() || - order == ORDER_SQUARE && cur->IsQuadratic() ) + order == ORDER_QUADRATIC && cur->IsQuadratic() ) Nb++; } return Nb; @@ -1022,7 +1022,7 @@ int SMESH_Mesh::NbFaces(ElementOrder order) throw(SALOME_Exception) while (it->more()) { const SMDS_MeshFace* cur = it->next(); if ( order == ORDER_LINEAR && !cur->IsQuadratic() || - order == ORDER_SQUARE && cur->IsQuadratic() ) + order == ORDER_QUADRATIC && cur->IsQuadratic() ) Nb++; } return Nb; @@ -1043,7 +1043,7 @@ int SMESH_Mesh::NbTriangles(ElementOrder order) throw(SALOME_Exception) if ( !curFace->IsPoly() && ( order == ORDER_ANY && (nbnod==3 || nbnod==6) || order == ORDER_LINEAR && nbnod==3 || - order == ORDER_SQUARE && nbnod==6 ) ) + order == ORDER_QUADRATIC && nbnod==6 ) ) Nb++; } return Nb; @@ -1064,7 +1064,7 @@ int SMESH_Mesh::NbQuadrangles(ElementOrder order) throw(SALOME_Exception) if ( !curFace->IsPoly() && ( order == ORDER_ANY && (nbnod==4 || nbnod==8) || order == ORDER_LINEAR && nbnod==4 || - order == ORDER_SQUARE && nbnod==8 ) ) + order == ORDER_QUADRATIC && nbnod==8 ) ) Nb++; } return Nb; @@ -1099,7 +1099,7 @@ int SMESH_Mesh::NbVolumes(ElementOrder order) throw(SALOME_Exception) while (it->more()) { const SMDS_MeshVolume* cur = it->next(); if ( order == ORDER_LINEAR && !cur->IsQuadratic() || - order == ORDER_SQUARE && cur->IsQuadratic() ) + order == ORDER_QUADRATIC && cur->IsQuadratic() ) Nb++; } return Nb; @@ -1116,7 +1116,7 @@ int SMESH_Mesh::NbTetras(ElementOrder order) throw(SALOME_Exception) if ( !curVolume->IsPoly() && ( order == ORDER_ANY && (nbnod==4 || nbnod==10) || order == ORDER_LINEAR && nbnod==4 || - order == ORDER_SQUARE && nbnod==10 ) ) + order == ORDER_QUADRATIC && nbnod==10 ) ) Nb++; } return Nb; @@ -1133,7 +1133,7 @@ int SMESH_Mesh::NbHexas(ElementOrder order) throw(SALOME_Exception) if ( !curVolume->IsPoly() && ( order == ORDER_ANY && (nbnod==8 || nbnod==20) || order == ORDER_LINEAR && nbnod==8 || - order == ORDER_SQUARE && nbnod==20 ) ) + order == ORDER_QUADRATIC && nbnod==20 ) ) Nb++; } return Nb; @@ -1150,7 +1150,7 @@ int SMESH_Mesh::NbPyramids(ElementOrder order) throw(SALOME_Exception) if ( !curVolume->IsPoly() && ( order == ORDER_ANY && (nbnod==5 || nbnod==13) || order == ORDER_LINEAR && nbnod==5 || - order == ORDER_SQUARE && nbnod==13 ) ) + order == ORDER_QUADRATIC && nbnod==13 ) ) Nb++; } return Nb; @@ -1167,7 +1167,7 @@ int SMESH_Mesh::NbPrisms(ElementOrder order) throw(SALOME_Exception) if ( !curVolume->IsPoly() && ( order == ORDER_ANY && (nbnod==6 || nbnod==15) || order == ORDER_LINEAR && nbnod==6 || - order == ORDER_SQUARE && nbnod==15 ) ) + order == ORDER_QUADRATIC && nbnod==15 ) ) Nb++; } return Nb; diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index a9d570adc..c377ed25b 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -180,7 +180,7 @@ public: enum ElementOrder { ORDER_ANY, /*! entities of any order */ ORDER_LINEAR, /*! entities of 1st order */ - ORDER_SQUARE /*! entities of 2nd order */ + ORDER_QUADRATIC /*! entities of 2nd order */ }; int NbEdges(ElementOrder order = ORDER_ANY) throw(SALOME_Exception); diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx index cc9d572ad..a5c5dc3a9 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx @@ -486,32 +486,32 @@ void SMESHGUI_MeshInfosDlg::DumpMeshInfos() myMeshNbNodes->setNum((int)aMesh->NbNodes()); myMeshNbEdges->setNum((int)aMesh->NbEdges()); myMeshNbEdges1->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbEdges2->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbEdges2->setNum((int)aMesh->NbEdgesOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbFaces->setNum((int)aMesh->NbFaces()); myMeshNbFaces1->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbFaces2->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbFaces2->setNum((int)aMesh->NbFacesOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbTriangles->setNum((int)aMesh->NbTriangles()); myMeshNbTriangles1->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbTriangles2->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbTriangles2->setNum((int)aMesh->NbTrianglesOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbQuadrangles->setNum((int)aMesh->NbQuadrangles()); myMeshNbQuadrangles1->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbQuadrangles2->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbQuadrangles2->setNum((int)aMesh->NbQuadranglesOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbPolygones->setNum( (int)aMesh->NbPolygons() ); myMeshNbVolumes->setNum((int)aMesh->NbVolumes()); myMeshNbVolumes1->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbVolumes2->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbVolumes2->setNum((int)aMesh->NbVolumesOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbTetra->setNum((int)aMesh->NbTetras()); myMeshNbTetra1->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbTetra2->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbTetra2->setNum((int)aMesh->NbTetrasOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbHexa->setNum((int)aMesh->NbHexas()); myMeshNbHexa1->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbHexa2->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbHexa2->setNum((int)aMesh->NbHexasOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbPrism->setNum((int)aMesh->NbPrisms()); myMeshNbPrism1->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbPrism2->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbPrism2->setNum((int)aMesh->NbPrismsOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbPyra->setNum((int)aMesh->NbPyramids()); myMeshNbPyra1->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_LINEAR)); - myMeshNbPyra2->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_SQUARE)); + myMeshNbPyra2->setNum((int)aMesh->NbPyramidsOfOrder(SMESH::ORDER_QUADRATIC)); myMeshNbPolyhedrones->setNum( (int)aMesh->NbPolyhedrons() ); return; } diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po index 7e038d20d..ade91216a 100644 --- a/src/SMESHGUI/SMESH_msg_en.po +++ b/src/SMESHGUI/SMESH_msg_en.po @@ -772,7 +772,7 @@ msgid "SMESH_MESHINFO_ORDER1" msgstr "Linear" msgid "SMESH_MESHINFO_ORDER2" -msgstr "Square" +msgstr "Quadratic" #Elements : msgid "SMESH_MESHINFO_ELEMENTS" -- 2.39.2