mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-03-16 01:41:27 +05:00
0021764: EDF SMESH: QUAD9 elements not counted in the mesh computation summary
Add recently added types of elements
This commit is contained in:
parent
0bab05d95d
commit
4bb457d7e6
@ -59,12 +59,20 @@ enum TCol {
|
|||||||
|
|
||||||
SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent)
|
SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent)
|
||||||
: QGroupBox( tr("SMESH_MESHINFO_TITLE"), theParent ), myFull( full ),
|
: QGroupBox( tr("SMESH_MESHINFO_TITLE"), theParent ), myFull( full ),
|
||||||
myNbNode(0), my0DElem(0), myNbEdge(0), myNbLinEdge(0), myNbQuadEdge(0),
|
myNbNode(0),
|
||||||
myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0), myNbQuad(0), myNbLinQuad(0),
|
my0DElem(0),
|
||||||
myNbQuadQuad(0), myNbFace(0), myNbLinFace(0), myNbQuadFace(0), myNbPolyg(0),
|
myBall(0),
|
||||||
myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(0), myNbTetra(0), myNbLinTetra(0),
|
myNbEdge(0), myNbLinEdge(0), myNbQuadEdge(0),
|
||||||
myNbQuadTetra(0), myNbPyra(0), myNbLinPyra(0), myNbQuadPyra(0), myNbPrism(0),
|
myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0),
|
||||||
myNbLinPrism(0), myNbQuadPrism(0), myNbVolum(0), myNbLinVolum(0), myNbQuadVolum(0),
|
myNbQuad(0), myNbLinQuad(0), myNbQuadQuad(0),
|
||||||
|
myNbFace(0), myNbLinFace(0), myNbQuadFace(0),
|
||||||
|
myNbPolyg(0),
|
||||||
|
myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(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),
|
||||||
|
myNbHexaPrism(0),
|
||||||
myNbPolyh(0)
|
myNbPolyh(0)
|
||||||
{
|
{
|
||||||
QGridLayout* l = new QGridLayout(this);
|
QGridLayout* l = new QGridLayout(this);
|
||||||
@ -120,6 +128,18 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
|
|||||||
|
|
||||||
addSeparator(this); // add separator
|
addSeparator(this); // add separator
|
||||||
|
|
||||||
|
// balls
|
||||||
|
row = l->rowCount(); // retrieve current row count
|
||||||
|
// --
|
||||||
|
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_BALLS")), this );
|
||||||
|
lab->setFont( bold );
|
||||||
|
l->addWidget( lab, row, 0 );
|
||||||
|
// --
|
||||||
|
myBall = new QLabel( this );
|
||||||
|
l->addWidget( myBall, row, 1 );
|
||||||
|
|
||||||
|
addSeparator(this); // add separator
|
||||||
|
|
||||||
// edges
|
// edges
|
||||||
row = l->rowCount(); // retrieve current row count
|
row = l->rowCount(); // retrieve current row count
|
||||||
// --
|
// --
|
||||||
@ -264,6 +284,14 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
|
|||||||
l->addWidget( myNbQuadPrism, row, 3 );
|
l->addWidget( myNbQuadPrism, row, 3 );
|
||||||
// --
|
// --
|
||||||
row++; // increment row count
|
row++; // increment row count
|
||||||
|
// ... hexa prisms
|
||||||
|
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_HEXAPRISM")), this );
|
||||||
|
l->addWidget( lab, row, 0 );
|
||||||
|
// --
|
||||||
|
myNbHexaPrism = new QLabel( this );
|
||||||
|
l->addWidget( myNbHexaPrism, row, 1 );
|
||||||
|
// --
|
||||||
|
row++; // increment row count
|
||||||
// ... polyedres
|
// ... polyedres
|
||||||
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_POLYEDRES")), this );
|
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_POLYEDRES")), this );
|
||||||
l->addWidget( lab, row, 0 );
|
l->addWidget( lab, row, 0 );
|
||||||
@ -354,6 +382,9 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
|
|||||||
//0D elements
|
//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] ));
|
||||||
|
|
||||||
// edges
|
// edges
|
||||||
myNbEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] +
|
myNbEdge ->setText( QString("%1").arg( theInfo[SMDSEntity_Edge] +
|
||||||
theInfo[SMDSEntity_Quad_Edge] ));
|
theInfo[SMDSEntity_Quad_Edge] ));
|
||||||
@ -365,6 +396,7 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
|
|||||||
theInfo[SMDSEntity_Quad_Triangle] +
|
theInfo[SMDSEntity_Quad_Triangle] +
|
||||||
theInfo[SMDSEntity_Quadrangle] +
|
theInfo[SMDSEntity_Quadrangle] +
|
||||||
theInfo[SMDSEntity_Quad_Quadrangle] +
|
theInfo[SMDSEntity_Quad_Quadrangle] +
|
||||||
|
theInfo[SMDSEntity_BiQuad_Quadrangle] +
|
||||||
theInfo[SMDSEntity_Polygon] ));
|
theInfo[SMDSEntity_Polygon] ));
|
||||||
myNbLinFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] +
|
myNbLinFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] +
|
||||||
theInfo[SMDSEntity_Quadrangle] +
|
theInfo[SMDSEntity_Quadrangle] +
|
||||||
@ -379,8 +411,10 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
|
|||||||
theInfo[SMDSEntity_Quad_Pyramid] +
|
theInfo[SMDSEntity_Quad_Pyramid] +
|
||||||
theInfo[SMDSEntity_Hexa] +
|
theInfo[SMDSEntity_Hexa] +
|
||||||
theInfo[SMDSEntity_Quad_Hexa] +
|
theInfo[SMDSEntity_Quad_Hexa] +
|
||||||
|
theInfo[SMDSEntity_TriQuad_Hexa] +
|
||||||
theInfo[SMDSEntity_Penta] +
|
theInfo[SMDSEntity_Penta] +
|
||||||
theInfo[SMDSEntity_Quad_Penta] +
|
theInfo[SMDSEntity_Quad_Penta] +
|
||||||
|
theInfo[SMDSEntity_Hexagonal_Prism] +
|
||||||
theInfo[SMDSEntity_Polyhedra] ));
|
theInfo[SMDSEntity_Polyhedra] ));
|
||||||
myNbLinVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] +
|
myNbLinVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Tetra] +
|
||||||
theInfo[SMDSEntity_Pyramid] +
|
theInfo[SMDSEntity_Pyramid] +
|
||||||
@ -427,6 +461,8 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
|
|||||||
theInfo[SMDSEntity_Quad_Penta] ));
|
theInfo[SMDSEntity_Quad_Penta] ));
|
||||||
myNbLinPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Penta] ));
|
myNbLinPrism ->setText( QString("%1").arg( theInfo[SMDSEntity_Penta] ));
|
||||||
myNbQuadPrism->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Penta] ));
|
myNbQuadPrism->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Penta] ));
|
||||||
|
// octahedra
|
||||||
|
myNbHexaPrism->setText( QString("%1").arg( theInfo[ SMDSEntity_Hexagonal_Prism ]));
|
||||||
// polyedres
|
// polyedres
|
||||||
myNbPolyh ->setText( QString("%1").arg( theInfo[SMDSEntity_Polyhedra] ));
|
myNbPolyh ->setText( QString("%1").arg( theInfo[SMDSEntity_Polyhedra] ));
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,7 @@ private:
|
|||||||
bool myFull;
|
bool myFull;
|
||||||
QLabel* myNbNode;
|
QLabel* myNbNode;
|
||||||
QLabel* my0DElem;
|
QLabel* my0DElem;
|
||||||
|
QLabel* myBall;
|
||||||
QLabel* myNbEdge;
|
QLabel* myNbEdge;
|
||||||
QLabel* myNbLinEdge;
|
QLabel* myNbLinEdge;
|
||||||
QLabel* myNbQuadEdge;
|
QLabel* myNbQuadEdge;
|
||||||
@ -80,6 +81,7 @@ private:
|
|||||||
QLabel* myNbVolum;
|
QLabel* myNbVolum;
|
||||||
QLabel* myNbLinVolum;
|
QLabel* myNbLinVolum;
|
||||||
QLabel* myNbQuadVolum;
|
QLabel* myNbQuadVolum;
|
||||||
|
QLabel* myNbHexaPrism;
|
||||||
QLabel* myNbPolyh;
|
QLabel* myNbPolyh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1879,6 +1879,10 @@ Check algorithm documentation for supported geometry</translation>
|
|||||||
<source>SMESH_MESHINFO_0DELEMS</source>
|
<source>SMESH_MESHINFO_0DELEMS</source>
|
||||||
<translation>0D Elements</translation>
|
<translation>0D Elements</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>SMESH_MESHINFO_BALLS</source>
|
||||||
|
<translation>Balls</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>SMESH_MESHINFO_ALL_TYPES</source>
|
<source>SMESH_MESHINFO_ALL_TYPES</source>
|
||||||
<translation>Heterogenous</translation>
|
<translation>Heterogenous</translation>
|
||||||
@ -1923,6 +1927,10 @@ Check algorithm documentation for supported geometry</translation>
|
|||||||
<source>SMESH_MESHINFO_ORDER2</source>
|
<source>SMESH_MESHINFO_ORDER2</source>
|
||||||
<translation>Quadratic</translation>
|
<translation>Quadratic</translation>
|
||||||
</message>
|
</message>
|
||||||
|
<message>
|
||||||
|
<source>SMESH_MESHINFO_HEXAPRISM</source>
|
||||||
|
<translation>Hexagonal prisms</translation>
|
||||||
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<source>SMESH_MESHINFO_POLYEDRES</source>
|
<source>SMESH_MESHINFO_POLYEDRES</source>
|
||||||
<translation>Polyhedrons</translation>
|
<translation>Polyhedrons</translation>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user