X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshInfosBox.cxx;h=72daba57a21e82ef99bc073b12dce3008e69cd0f;hb=fdab1d32d5c6a0e4e3e8548e717f725156ac88a2;hp=f6fee7bb272cadfe1fe591eaffa230d14cd0e848;hpb=bd8f1aee7c78f7d2eb82bd4fec5e08c9e3d280ce;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx index f6fee7bb2..72daba57a 100644 --- a/src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE // // 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. +// 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 @@ -63,15 +63,15 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent my0DElem(0), myBall(0), myNbEdge(0), myNbLinEdge(0), myNbQuadEdge(0), - myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0), - myNbQuad(0), myNbLinQuad(0), myNbQuadQuad(0), - myNbFace(0), myNbLinFace(0), myNbQuadFace(0), - myNbPolyg(0), - myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(0), + myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0), myNbBiQuadTrai(0), + myNbQuad(0), myNbLinQuad(0), myNbQuadQuad(0), myNbBiQuadQuad(0), + myNbFace(0), myNbLinFace(0), myNbQuadFace(0), myNbBiQuadFace(0), + myNbPolyg(0), myNbQuadPolyg(0), + myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(0), myNbBiQuadHexa(0), myNbTetra(0),myNbLinTetra(0),myNbQuadTetra(0), myNbPyra(0), myNbLinPyra(0), myNbQuadPyra(0), - myNbPrism(0),myNbLinPrism(0), myNbQuadPrism(0), - myNbVolum(0), myNbLinVolum(0), myNbQuadVolum(0), + myNbPrism(0),myNbLinPrism(0), myNbQuadPrism(0), myNbBiQuadPrism(0), + myNbVolum(0), myNbLinVolum(0), myNbQuadVolum(0), myNbBiQuadVolum(0), myNbHexaPrism(0), myNbPolyh(0) { @@ -101,6 +101,10 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent lab = new QLabel(tr("SMESH_MESHINFO_ORDER2"), this ); lab->setMinimumWidth(100); lab->setFont( italic ); l->addWidget( lab, row, 3 ); + // -- + lab = new QLabel(tr("SMESH_MESHINFO_ORDER3"), this ); + lab->setMinimumWidth(100); lab->setFont( italic ); + l->addWidget( lab, row, 4 ); if ( myFull ) { @@ -163,51 +167,67 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent // -- lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_FACES")), this); lab->setFont( bold ); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); + // -- + myNbFace = new QLabel( this ); + l->addWidget( myNbFace, row, 1 ); // -- - myNbFace = new QLabel( this ); - l->addWidget( myNbFace, row, 1 ); + myNbLinFace = new QLabel( this ); + l->addWidget( myNbLinFace, row, 2 ); // -- - myNbLinFace = new QLabel( this ); - l->addWidget( myNbLinFace, row, 2 ); + myNbQuadFace = new QLabel( this ); + l->addWidget( myNbQuadFace, row, 3 ); // -- - myNbQuadFace = new QLabel( this ); - l->addWidget( myNbQuadFace, row, 3 ); + myNbBiQuadFace = new QLabel( this ); + l->addWidget( myNbBiQuadFace, row, 4 ); // -- row++; // increment row count // ... triangles lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_TRIANGLES")), this ); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); + // -- + myNbTrai = new QLabel( this ); + l->addWidget( myNbTrai, row, 1 ); // -- - myNbTrai = new QLabel( this ); - l->addWidget( myNbTrai, row, 1 ); + myNbLinTrai = new QLabel( this ); + l->addWidget( myNbLinTrai, row, 2 ); // -- - myNbLinTrai = new QLabel( this ); - l->addWidget( myNbLinTrai, row, 2 ); + myNbQuadTrai = new QLabel( this ); + l->addWidget( myNbQuadTrai, row, 3 ); // -- - myNbQuadTrai = new QLabel( this ); - l->addWidget( myNbQuadTrai, row, 3 ); + myNbBiQuadTrai = new QLabel( this ); + l->addWidget( myNbBiQuadTrai, row, 4 ); // -- row++; // increment row count // ... quadrangles lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_QUADRANGLES")), this ); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); // -- - myNbQuad = new QLabel( this ); - l->addWidget( myNbQuad, row, 1 ); + myNbQuad = new QLabel( this ); + l->addWidget( myNbQuad, row, 1 ); // -- - myNbLinQuad = new QLabel( this ); - l->addWidget( myNbLinQuad, row, 2 ); + myNbLinQuad = new QLabel( this ); + l->addWidget( myNbLinQuad, row, 2 ); // -- - myNbQuadQuad = new QLabel( this ); - l->addWidget( myNbQuadQuad, row, 3 ); + myNbQuadQuad = new QLabel( this ); + l->addWidget( myNbQuadQuad, row, 3 ); + // -- + myNbBiQuadQuad = new QLabel( this ); + l->addWidget( myNbBiQuadQuad, row, 4 ); // -- row++; // increment row count // ... poligones lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_POLYGONES")), this ); l->addWidget( lab, row, 0 ); + // -- myNbPolyg = new QLabel( this ); l->addWidget( myNbPolyg, row, 1 ); + // -- + myNbLinPolyg = new QLabel( this ); + l->addWidget( myNbLinPolyg, row, 2 ); + // -- + myNbQuadPolyg = new QLabel( this ); + l->addWidget( myNbQuadPolyg, row, 3 ); addSeparator(this); // add separator @@ -216,16 +236,19 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent // -- lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_VOLUMES")), this); lab->setFont( bold ); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); + // -- + myNbVolum = new QLabel( this ); + l->addWidget( myNbVolum, row, 1 ); // -- - myNbVolum = new QLabel( this ); - l->addWidget( myNbVolum, row, 1 ); + myNbLinVolum = new QLabel( this ); + l->addWidget( myNbLinVolum, row, 2 ); // -- - myNbLinVolum = new QLabel( this ); - l->addWidget( myNbLinVolum, row, 2 ); + myNbQuadVolum = new QLabel( this ); + l->addWidget( myNbQuadVolum, row, 3 ); // -- - myNbQuadVolum = new QLabel( this ); - l->addWidget( myNbQuadVolum, row, 3 ); + myNbBiQuadVolum = new QLabel( this ); + l->addWidget( myNbBiQuadVolum, row, 4 ); // -- row++; // increment row count // ... tetras @@ -244,16 +267,19 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent row++; // increment row count // ... hexas lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_HEXAS")), this ); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); // -- - myNbHexa = new QLabel( this ); - l->addWidget( myNbHexa, row, 1 ); + myNbHexa = new QLabel( this ); + l->addWidget( myNbHexa, row, 1 ); // -- - myNbLinHexa = new QLabel( this ); - l->addWidget( myNbLinHexa, row, 2 ); + myNbLinHexa = new QLabel( this ); + l->addWidget( myNbLinHexa, row, 2 ); // -- - myNbQuadHexa = new QLabel( this ); - l->addWidget( myNbQuadHexa, row, 3 ); + myNbQuadHexa = new QLabel( this ); + l->addWidget( myNbQuadHexa, row, 3 ); + // -- + myNbBiQuadHexa = new QLabel( this ); + l->addWidget( myNbBiQuadHexa, row, 4 ); // -- row++; // increment row count // ... pyras @@ -283,6 +309,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent myNbQuadPrism = new QLabel( this ); l->addWidget( myNbQuadPrism, row, 3 ); // -- + myNbBiQuadPrism = new QLabel( this ); + l->addWidget( myNbBiQuadPrism, row, 4 ); + // -- row++; // increment row count // ... hexa prisms lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_HEXAPRISM")), this ); @@ -349,31 +378,37 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent row = l->rowCount(); // retrieve current row count // -- lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_FACES")), this); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); + // -- + myNbFace = new QLabel( this ); + l->addWidget( myNbFace, row, 1 ); // -- - myNbFace = new QLabel( this ); - l->addWidget( myNbFace, row, 1 ); + myNbLinFace = new QLabel( this ); + l->addWidget( myNbLinFace, row, 2 ); // -- - myNbLinFace = new QLabel( this ); - l->addWidget( myNbLinFace, row, 2 ); + myNbQuadFace = new QLabel( this ); + l->addWidget( myNbQuadFace, row, 3 ); // -- - myNbQuadFace = new QLabel( this ); - l->addWidget( myNbQuadFace, row, 3 ); + myNbBiQuadFace = new QLabel( this ); + l->addWidget( myNbBiQuadFace, row, 4 ); // volumes row = l->rowCount(); // retrieve current row count // -- lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_VOLUMES")), this); - l->addWidget( lab, row, 0 ); + l->addWidget( lab, row, 0 ); + // -- + myNbVolum = new QLabel( this ); + l->addWidget( myNbVolum, row, 1 ); // -- - myNbVolum = new QLabel( this ); - l->addWidget( myNbVolum, row, 1 ); + myNbLinVolum = new QLabel( this ); + l->addWidget( myNbLinVolum, row, 2 ); // -- - myNbLinVolum = new QLabel( this ); - l->addWidget( myNbLinVolum, row, 2 ); + myNbQuadVolum = new QLabel( this ); + l->addWidget( myNbQuadVolum, row, 3 ); // -- - myNbQuadVolum = new QLabel( this ); - l->addWidget( myNbQuadVolum, row, 3 ); + myNbBiQuadVolum = new QLabel( this ); + l->addWidget( myNbBiQuadVolum, row, 4 ); } } @@ -386,86 +421,97 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo) { // nodes - myNbNode ->setText( QString("%1").arg( theInfo[SMDSEntity_Node] )); + myNbNode ->setText( QString("%1").arg( theInfo[SMDSEntity_Node] )); //0D elements - my0DElem ->setText( QString("%1").arg( theInfo[SMDSEntity_0D] )); + my0DElem ->setText( QString("%1").arg( theInfo[SMDSEntity_0D] )); //balls - myBall ->setText( QString("%1").arg( theInfo[SMDSEntity_Ball] )); + myBall ->setText( QString("%1").arg( theInfo[SMDSEntity_Ball] )); // edges - myNbEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] + - theInfo[SMDSEntity_Quad_Edge] )); - myNbLinEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] )); - myNbQuadEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Edge] )); + myNbEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] + + theInfo[SMDSEntity_Quad_Edge] )); + myNbLinEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] )); + myNbQuadEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Edge] )); // faces - myNbFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + - theInfo[SMDSEntity_Quad_Triangle] + - theInfo[SMDSEntity_Quadrangle] + - theInfo[SMDSEntity_Quad_Quadrangle] + - theInfo[SMDSEntity_BiQuad_Quadrangle] + - theInfo[SMDSEntity_Polygon] )); - myNbLinFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + - theInfo[SMDSEntity_Quadrangle] + - theInfo[SMDSEntity_Polygon] )); - myNbQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] + - theInfo[SMDSEntity_Quad_Quadrangle] + - theInfo[SMDSEntity_BiQuad_Quadrangle] )); + myNbFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + + theInfo[SMDSEntity_Quad_Triangle] + + theInfo[SMDSEntity_BiQuad_Triangle] + + theInfo[SMDSEntity_Quadrangle] + + theInfo[SMDSEntity_Quad_Quadrangle] + + theInfo[SMDSEntity_BiQuad_Quadrangle] + + theInfo[SMDSEntity_Polygon] + + theInfo[SMDSEntity_Quad_Polygon])); + myNbLinFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + + theInfo[SMDSEntity_Quadrangle] + + theInfo[SMDSEntity_Polygon] )); + myNbQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] + + theInfo[SMDSEntity_Quad_Quadrangle] + + theInfo[SMDSEntity_Quad_Polygon] )); + myNbBiQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Triangle] + + theInfo[SMDSEntity_BiQuad_Quadrangle] )); // volumes - myNbVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + - theInfo[SMDSEntity_Quad_Tetra] + - theInfo[SMDSEntity_Pyramid] + - theInfo[SMDSEntity_Quad_Pyramid] + - theInfo[SMDSEntity_Hexa] + - theInfo[SMDSEntity_Quad_Hexa] + - theInfo[SMDSEntity_TriQuad_Hexa] + - theInfo[SMDSEntity_Penta] + - theInfo[SMDSEntity_Quad_Penta] + - theInfo[SMDSEntity_Hexagonal_Prism] + - theInfo[SMDSEntity_Polyhedra] )); - myNbLinVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + - theInfo[SMDSEntity_Pyramid] + - theInfo[SMDSEntity_Hexa] + - theInfo[SMDSEntity_Penta] + - theInfo[SMDSEntity_Polyhedra] )); - myNbQuadVolum->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] + - theInfo[SMDSEntity_Quad_Pyramid] + - theInfo[SMDSEntity_Quad_Hexa] + - theInfo[SMDSEntity_TriQuad_Hexa] + - theInfo[SMDSEntity_Quad_Penta] )); + myNbVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + + theInfo[SMDSEntity_Quad_Tetra] + + theInfo[SMDSEntity_Pyramid] + + theInfo[SMDSEntity_Quad_Pyramid] + + theInfo[SMDSEntity_Hexa] + + theInfo[SMDSEntity_Quad_Hexa] + + theInfo[SMDSEntity_TriQuad_Hexa] + + theInfo[SMDSEntity_Penta] + + theInfo[SMDSEntity_Quad_Penta] + + theInfo[SMDSEntity_BiQuad_Penta] + + theInfo[SMDSEntity_Hexagonal_Prism] + + theInfo[SMDSEntity_Polyhedra] )); + myNbLinVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + + theInfo[SMDSEntity_Pyramid] + + theInfo[SMDSEntity_Hexa] + + theInfo[SMDSEntity_Penta] + + theInfo[SMDSEntity_Polyhedra] )); + myNbQuadVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] + + theInfo[SMDSEntity_Quad_Pyramid] + + theInfo[SMDSEntity_Quad_Hexa] + + theInfo[SMDSEntity_Quad_Penta] )); + myNbBiQuadVolum->setText( QString("%1").arg( theInfo[SMDSEntity_TriQuad_Hexa] + + theInfo[SMDSEntity_BiQuad_Penta] )); if ( myFull ) { // triangles - myNbTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + - theInfo[SMDSEntity_Quad_Triangle] )); - myNbLinTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] )); - myNbQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] )); + myNbTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] + + theInfo[SMDSEntity_Quad_Triangle] + + theInfo[SMDSEntity_BiQuad_Triangle] )); + myNbLinTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] )); + myNbQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] )); + myNbBiQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Triangle] )); // quadrangles - myNbQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] + - theInfo[SMDSEntity_Quad_Quadrangle] + - theInfo[SMDSEntity_BiQuad_Quadrangle] )); - myNbLinQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] )); - myNbQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Quadrangle] + - theInfo[SMDSEntity_BiQuad_Quadrangle])); + myNbQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] + + theInfo[SMDSEntity_Quad_Quadrangle] + + theInfo[SMDSEntity_BiQuad_Quadrangle] )); + myNbLinQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] )); + myNbQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Quadrangle] )); + myNbBiQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Quadrangle])); // poligones - myNbPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Polygon] )); + myNbPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Polygon] + + theInfo[SMDSEntity_Quad_Polygon] )); + myNbLinPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Polygon] )); + myNbQuadPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Polygon] )); // tetras - myNbTetra ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + - theInfo[SMDSEntity_Quad_Tetra] )); - myNbLinTetra ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] )); - myNbQuadTetra->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] )); + myNbTetra ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] + + theInfo[SMDSEntity_Quad_Tetra] )); + myNbLinTetra ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] )); + myNbQuadTetra ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] )); // hexas - myNbHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] + - theInfo[SMDSEntity_TriQuad_Hexa], - theInfo[SMDSEntity_Quad_Hexa] )); - myNbLinHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] )); - myNbQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Hexa] + - theInfo[SMDSEntity_TriQuad_Hexa] )); + myNbHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] + + theInfo[SMDSEntity_TriQuad_Hexa] + + theInfo[SMDSEntity_Quad_Hexa] )); + myNbLinHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] )); + myNbQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Hexa] )); + myNbBiQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_TriQuad_Hexa] )); // pyras myNbPyra ->setText( QString("%1").arg( theInfo[SMDSEntity_Pyramid] + theInfo[SMDSEntity_Quad_Pyramid] )); @@ -473,9 +519,11 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo) myNbQuadPyra ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Pyramid] )); // prisms myNbPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Penta] + - theInfo[SMDSEntity_Quad_Penta] )); - myNbLinPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Penta] )); - myNbQuadPrism->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Penta] )); + theInfo[SMDSEntity_Quad_Penta] + + theInfo[SMDSEntity_BiQuad_Penta] )); + myNbLinPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Penta] )); + myNbQuadPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Penta] )); + myNbBiQuadPrism->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Penta] )); // octahedra myNbHexaPrism->setText( QString("%1").arg( theInfo[ SMDSEntity_Hexagonal_Prism ])); // polyedres