ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-05-06 01:50:47 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022523: [CEA 1096] Add a colomn "biquadratic" in "Mesh Information"

Browse Source
This commit is contained in:
imn 2014-03-21 20:58:45 +04:00
parent 17de6ce8ed
commit 1821a9c35f
8 changed files with 485 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
View File

@ -619,8 +619,8 @@ QFrame* SMESHGUI_ComputeDlg::createMainFrame (QWidget* theParent, bool ForEval)
// add all widgets to aFrame // add all widgets to aFrame
QVBoxLayout* aLay = new QVBoxLayout(aFrame); QVBoxLayout* aLay = new QVBoxLayout(aFrame);
aLay->setMargin( 0 ); aLay->setMargin( MARGIN );
aLay->setSpacing( 0 ); aLay->setSpacing( SPACING );
aLay->addWidget( aPixGrp ); aLay->addWidget( aPixGrp );
aLay->addWidget( nameBox ); aLay->addWidget( nameBox );
aLay->addWidget( myBriefInfo ); aLay->addWidget( myBriefInfo );

102
src/SMESHGUI/SMESHGUI_MeshInfo.cxx
View File

@ -250,16 +250,18 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* aElemTotal = new QLabel( tr( "TOTAL_LAB" ), this ); QLabel* aElemTotal = new QLabel( tr( "TOTAL_LAB" ), this );
QLabel* aElemLin = new QLabel( tr( "LINEAR_LAB" ), this ); QLabel* aElemLin = new QLabel( tr( "LINEAR_LAB" ), this );
QLabel* aElemQuad = new QLabel( tr( "QUADRATIC_LAB" ), this ); QLabel* aElemQuad = new QLabel( tr( "QUADRATIC_LAB" ), this );
QLabel* aElemBiQuad = new QLabel( tr( "BI_QUADRATIC_LAB" ), this );
myWidgets[ index++ ] << aElemLine; myWidgets[ index++ ] << aElemLine;
myWidgets[ index++ ] << aElemLab << aElemTotal << aElemLin << aElemQuad; myWidgets[ index++ ] << aElemLab << aElemTotal << aElemLin << aElemQuad << aElemBiQuad;
// ... Number elements // ... Number elements
QWidget* aNbLine = createLine(); QWidget* aNbLine = createLine();
QLabel* aNbTotal = createField(); QLabel* aNbTotal = createField();
QLabel* aNbLin = createField(); QLabel* aNbLin = createField();
QLabel* aNbQuad = createField(); QLabel* aNbQuad = createField();
QLabel* aNbBiQuad = createField();
myWidgets[ index++ ] << aNbLine; myWidgets[ index++ ] << aNbLine;
myWidgets[ index++ ] << new QLabel( "", this ) << aNbTotal << aNbLin << aNbQuad; myWidgets[ index++ ] << new QLabel( "", this ) << aNbTotal << aNbLin << aNbQuad << aNbBiQuad;
// ... 0D elements // ... 0D elements
QWidget* a0DLine = createLine(); QWidget* a0DLine = createLine();
@ -290,20 +292,23 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* a2DTotal = createField(); QLabel* a2DTotal = createField();
QLabel* a2DLin = createField(); QLabel* a2DLin = createField();
QLabel* a2DQuad = createField(); QLabel* a2DQuad = createField();
QLabel* a2DBiQuad = createField();
QLabel* a2DTriLab = new QLabel( tr( "TRIANGLES_LAB" ), this ); QLabel* a2DTriLab = new QLabel( tr( "TRIANGLES_LAB" ), this );
QLabel* a2DTriTotal = createField(); QLabel* a2DTriTotal = createField();
QLabel* a2DTriLin = createField(); QLabel* a2DTriLin = createField();
QLabel* a2DTriQuad = createField(); QLabel* a2DTriQuad = createField();
QLabel* a2DTriBiQuad = createField();
QLabel* a2DQuaLab = new QLabel( tr( "QUADRANGLES_LAB" ), this ); QLabel* a2DQuaLab = new QLabel( tr( "QUADRANGLES_LAB" ), this );
QLabel* a2DQuaTotal = createField(); QLabel* a2DQuaTotal = createField();
QLabel* a2DQuaLin = createField(); QLabel* a2DQuaLin = createField();
QLabel* a2DQuaQuad = createField(); QLabel* a2DQuaQuad = createField();
QLabel* a2DQuaBiQuad = createField();
QLabel* a2DPolLab = new QLabel( tr( "POLYGONS_LAB" ), this ); QLabel* a2DPolLab = new QLabel( tr( "POLYGONS_LAB" ), this );
QLabel* a2DPolTotal = createField(); QLabel* a2DPolTotal = createField();
myWidgets[ index++ ] << a2DLine; myWidgets[ index++ ] << a2DLine;
myWidgets[ index++ ] << a2DLab << a2DTotal << a2DLin << a2DQuad; myWidgets[ index++ ] << a2DLab << a2DTotal << a2DLin << a2DQuad << a2DBiQuad;
myWidgets[ index++ ] << a2DTriLab << a2DTriTotal << a2DTriLin << a2DTriQuad; myWidgets[ index++ ] << a2DTriLab << a2DTriTotal << a2DTriLin << a2DTriQuad << a2DTriBiQuad;
myWidgets[ index++ ] << a2DQuaLab << a2DQuaTotal << a2DQuaLin << a2DQuaQuad; myWidgets[ index++ ] << a2DQuaLab << a2DQuaTotal << a2DQuaLin << a2DQuaQuad << a2DQuaBiQuad;
myWidgets[ index++ ] << a2DPolLab << a2DPolTotal; myWidgets[ index++ ] << a2DPolLab << a2DPolTotal;
// ... 3D elements // ... 3D elements
@ -312,6 +317,7 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* a3DTotal = createField(); QLabel* a3DTotal = createField();
QLabel* a3DLin = createField(); QLabel* a3DLin = createField();
QLabel* a3DQuad = createField(); QLabel* a3DQuad = createField();
QLabel* a3DBiQuad = createField();
QLabel* a3DTetLab = new QLabel( tr( "TETRAHEDRONS_LAB" ), this ); QLabel* a3DTetLab = new QLabel( tr( "TETRAHEDRONS_LAB" ), this );
QLabel* a3DTetTotal = createField(); QLabel* a3DTetTotal = createField();
QLabel* a3DTetLin = createField(); QLabel* a3DTetLin = createField();
@ -320,6 +326,7 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* a3DHexTotal = createField(); QLabel* a3DHexTotal = createField();
QLabel* a3DHexLin = createField(); QLabel* a3DHexLin = createField();
QLabel* a3DHexQuad = createField(); QLabel* a3DHexQuad = createField();
QLabel* a3DHexBiQuad = createField();
QLabel* a3DPyrLab = new QLabel( tr( "PYRAMIDS_LAB" ), this ); QLabel* a3DPyrLab = new QLabel( tr( "PYRAMIDS_LAB" ), this );
QLabel* a3DPyrTotal = createField(); QLabel* a3DPyrTotal = createField();
QLabel* a3DPyrLin = createField(); QLabel* a3DPyrLin = createField();
@ -333,9 +340,9 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
QLabel* a3DPolLab = new QLabel( tr( "POLYHEDRONS_LAB" ), this ); QLabel* a3DPolLab = new QLabel( tr( "POLYHEDRONS_LAB" ), this );
QLabel* a3DPolTotal = createField(); QLabel* a3DPolTotal = createField();
myWidgets[ index++ ] << a3DLine; myWidgets[ index++ ] << a3DLine;
myWidgets[ index++ ] << a3DLab << a3DTotal << a3DLin << a3DQuad; myWidgets[ index++ ] << a3DLab << a3DTotal << a3DLin << a3DQuad << a3DBiQuad;
myWidgets[ index++ ] << a3DTetLab << a3DTetTotal << a3DTetLin << a3DTetQuad; myWidgets[ index++ ] << a3DTetLab << a3DTetTotal << a3DTetLin << a3DTetQuad;
myWidgets[ index++ ] << a3DHexLab << a3DHexTotal << a3DHexLin << a3DHexQuad; myWidgets[ index++ ] << a3DHexLab << a3DHexTotal << a3DHexLin << a3DHexQuad << a3DHexBiQuad;
myWidgets[ index++ ] << a3DPyrLab << a3DPyrTotal << a3DPyrLin << a3DPyrQuad; myWidgets[ index++ ] << a3DPyrLab << a3DPyrTotal << a3DPyrLin << a3DPyrQuad;
myWidgets[ index++ ] << a3DPriLab << a3DPriTotal << a3DPriLin << a3DPriQuad; myWidgets[ index++ ] << a3DPriLab << a3DPriTotal << a3DPriLin << a3DPriQuad;
myWidgets[ index++ ] << a3DHexPriLab << a3DHexPriTotal; myWidgets[ index++ ] << a3DHexPriLab << a3DHexPriTotal;
@ -352,6 +359,7 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
setFontAttributes( aElemTotal, Italic ); setFontAttributes( aElemTotal, Italic );
setFontAttributes( aElemLin, Italic ); setFontAttributes( aElemLin, Italic );
setFontAttributes( aElemQuad, Italic ); setFontAttributes( aElemQuad, Italic );
setFontAttributes( aElemBiQuad, Italic );
setFontAttributes( a0DLab, Bold ); setFontAttributes( a0DLab, Bold );
setFontAttributes( aBallLab, Bold ); setFontAttributes( aBallLab, Bold );
setFontAttributes( a1DLab, Bold ); setFontAttributes( a1DLab, Bold );
@ -359,52 +367,58 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
setFontAttributes( a3DLab, Bold ); setFontAttributes( a3DLab, Bold );
l->addWidget( aNameLab, 0, 0 ); l->addWidget( aNameLab, 0, 0 );
l->addWidget( aName, 0, 1, 1, 3 ); l->addWidget( aName, 0, 1, 1, 4 );
l->addWidget( aObjLab, 1, 0 ); l->addWidget( aObjLab, 1, 0 );
l->addWidget( aObj, 1, 1, 1, 3 ); l->addWidget( aObj, 1, 1, 1, 4 );
l->addWidget( aNodesLine, 2, 0, 1, 4 ); l->addWidget( aNodesLine, 2, 0, 1, 5 );
l->addWidget( aNodesLab, 3, 0 ); l->addWidget( aNodesLab, 3, 0 );
l->addWidget( aNodes, 3, 1 ); l->addWidget( aNodes, 3, 1 );
l->addWidget( aElemLine, 4, 0, 1, 4 ); l->addWidget( aElemLine, 4, 0, 1, 5 );
l->addWidget( aElemLab, 5, 0 ); l->addWidget( aElemLab, 5, 0 );
l->addWidget( aElemTotal, 5, 1 ); l->addWidget( aElemTotal, 5, 1 );
l->addWidget( aElemLin, 5, 2 ); l->addWidget( aElemLin, 5, 2 );
l->addWidget( aElemQuad, 5, 3 ); l->addWidget( aElemQuad, 5, 3 );
l->addWidget( aNbLine, 6, 1, 1, 3 ); l->addWidget( aElemBiQuad, 5, 4 );
l->addWidget( aNbLine, 6, 1, 1, 4 );
l->addWidget( aNbTotal, 7, 1 ); l->addWidget( aNbTotal, 7, 1 );
l->addWidget( aNbLin, 7, 2 ); l->addWidget( aNbLin, 7, 2 );
l->addWidget( aNbQuad, 7, 3 ); l->addWidget( aNbQuad, 7, 3 );
l->addWidget( a0DLine, 8, 1, 1, 3 ); l->addWidget( aNbBiQuad, 7, 4 );
l->addWidget( a0DLine, 8, 1, 1, 4 );
l->addWidget( a0DLab, 9, 0 ); l->addWidget( a0DLab, 9, 0 );
l->addWidget( a0DTotal, 9, 1 ); l->addWidget( a0DTotal, 9, 1 );
l->addWidget( aBallLine, 10, 1, 1, 3 ); l->addWidget( aBallLine, 10, 1, 1, 4 );
l->addWidget( aBallLab, 11, 0 ); l->addWidget( aBallLab, 11, 0 );
l->addWidget( aBallTotal, 11, 1 ); l->addWidget( aBallTotal, 11, 1 );
l->addWidget( a1DLine, 12, 1, 1, 3 ); l->addWidget( a1DLine, 12, 1, 1, 4 );
l->addWidget( a1DLab, 13, 0 ); l->addWidget( a1DLab, 13, 0 );
l->addWidget( a1DTotal, 13, 1 ); l->addWidget( a1DTotal, 13, 1 );
l->addWidget( a1DLin, 13, 2 ); l->addWidget( a1DLin, 13, 2 );
l->addWidget( a1DQuad, 13, 3 ); l->addWidget( a1DQuad, 13, 3 );
l->addWidget( a2DLine, 14, 1, 1, 3 ); l->addWidget( a2DLine, 14, 1, 1, 4 );
l->addWidget( a2DLab, 15, 0 ); l->addWidget( a2DLab, 15, 0 );
l->addWidget( a2DTotal, 15, 1 ); l->addWidget( a2DTotal, 15, 1 );
l->addWidget( a2DLin, 15, 2 ); l->addWidget( a2DLin, 15, 2 );
l->addWidget( a2DQuad, 15, 3 ); l->addWidget( a2DQuad, 15, 3 );
l->addWidget( a2DBiQuad, 15, 4 );
l->addWidget( a2DTriLab, 16, 0 ); l->addWidget( a2DTriLab, 16, 0 );
l->addWidget( a2DTriTotal, 16, 1 ); l->addWidget( a2DTriTotal, 16, 1 );
l->addWidget( a2DTriLin, 16, 2 ); l->addWidget( a2DTriLin, 16, 2 );
l->addWidget( a2DTriQuad, 16, 3 ); l->addWidget( a2DTriQuad, 16, 3 );
l->addWidget( a2DTriBiQuad, 16, 4 );
l->addWidget( a2DQuaLab, 17, 0 ); l->addWidget( a2DQuaLab, 17, 0 );
l->addWidget( a2DQuaTotal, 17, 1 ); l->addWidget( a2DQuaTotal, 17, 1 );
l->addWidget( a2DQuaLin, 17, 2 ); l->addWidget( a2DQuaLin, 17, 2 );
l->addWidget( a2DQuaQuad, 17, 3 ); l->addWidget( a2DQuaQuad, 17, 3 );
l->addWidget( a2DQuaBiQuad, 17, 4 );
l->addWidget( a2DPolLab, 18, 0 ); l->addWidget( a2DPolLab, 18, 0 );
l->addWidget( a2DPolTotal, 18, 1 ); l->addWidget( a2DPolTotal, 18, 1 );
l->addWidget( a3DLine, 19, 1, 1, 3 ); l->addWidget( a3DLine, 19, 1, 1, 4 );
l->addWidget( a3DLab, 20, 0 ); l->addWidget( a3DLab, 20, 0 );
l->addWidget( a3DTotal, 20, 1 ); l->addWidget( a3DTotal, 20, 1 );
l->addWidget( a3DLin, 20, 2 ); l->addWidget( a3DLin, 20, 2 );
l->addWidget( a3DQuad, 20, 3 ); l->addWidget( a3DQuad, 20, 3 );
l->addWidget( a3DBiQuad, 20, 4 );
l->addWidget( a3DTetLab, 21, 0 ); l->addWidget( a3DTetLab, 21, 0 );
l->addWidget( a3DTetTotal, 21, 1 ); l->addWidget( a3DTetTotal, 21, 1 );
l->addWidget( a3DTetLin, 21, 2 ); l->addWidget( a3DTetLin, 21, 2 );
@ -413,6 +427,7 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
l->addWidget( a3DHexTotal, 22, 1 ); l->addWidget( a3DHexTotal, 22, 1 );
l->addWidget( a3DHexLin, 22, 2 ); l->addWidget( a3DHexLin, 22, 2 );
l->addWidget( a3DHexQuad, 22, 3 ); l->addWidget( a3DHexQuad, 22, 3 );
l->addWidget( a3DHexBiQuad, 22, 4 );
l->addWidget( a3DPyrLab, 23, 0 ); l->addWidget( a3DPyrLab, 23, 0 );
l->addWidget( a3DPyrTotal, 23, 1 ); l->addWidget( a3DPyrTotal, 23, 1 );
l->addWidget( a3DPyrLin, 23, 2 ); l->addWidget( a3DPyrLin, 23, 2 );
@ -425,12 +440,13 @@ SMESHGUI_MeshInfo::SMESHGUI_MeshInfo( QWidget* parent )
l->addWidget( a3DHexPriTotal, 25, 1 ); l->addWidget( a3DHexPriTotal, 25, 1 );
l->addWidget( a3DPolLab, 26, 0 ); l->addWidget( a3DPolLab, 26, 0 );
l->addWidget( a3DPolTotal, 26, 1 ); l->addWidget( a3DPolTotal, 26, 1 );
l->addWidget( myLoadBtn, 28, 1, 1, 3 ); l->addWidget( myLoadBtn, 28, 1, 1, 4 );
l->setColumnStretch( 0, 0 ); l->setColumnStretch( 0, 0 );
l->setColumnStretch( 1, 5 ); l->setColumnStretch( 1, 5 );
l->setColumnStretch( 2, 5 ); l->setColumnStretch( 2, 5 );
l->setColumnStretch( 3, 5 ); l->setColumnStretch( 3, 5 );
l->setColumnStretch( 4, 5 );
l->setRowStretch( 27, 5 ); l->setRowStretch( 27, 5 );
clear(); clear();
@ -487,32 +503,40 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
long nbTriangles = info[SMDSEntity_Triangle] + info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle]; long nbTriangles = info[SMDSEntity_Triangle] + info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle];
long nbQuadrangles = info[SMDSEntity_Quadrangle] + info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle]; long nbQuadrangles = info[SMDSEntity_Quadrangle] + info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle];
long nb2DLinear = info[SMDSEntity_Triangle] + info[SMDSEntity_Quadrangle] + info[SMDSEntity_Polygon]; long nb2DLinear = info[SMDSEntity_Triangle] + info[SMDSEntity_Quadrangle] + info[SMDSEntity_Polygon];
long nb2DQuadratic = info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle] + info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle]; long nb2DQuadratic = info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_Quad_Quadrangle];
long nb2DBiQuadratic = info[SMDSEntity_BiQuad_Triangle] + info[SMDSEntity_BiQuad_Quadrangle];
myWidgets[i2D][iTotal] ->setProperty( "text", QString::number( nb2DLinear + nb2DQuadratic )); myWidgets[i2D][iTotal] ->setProperty( "text", QString::number( nb2DLinear + nb2DQuadratic ));
myWidgets[i2D][iLinear] ->setProperty( "text", QString::number( nb2DLinear ) ); myWidgets[i2D][iLinear] ->setProperty( "text", QString::number( nb2DLinear ) );
myWidgets[i2D][iQuadratic] ->setProperty( "text", QString::number( nb2DQuadratic ) ); myWidgets[i2D][iQuadratic] ->setProperty( "text", QString::number( nb2DQuadratic ) );
myWidgets[i2D][iBiQuadratic] ->setProperty( "text", QString::number( nb2DBiQuadratic ) );
myWidgets[i2DTriangles][iTotal] ->setProperty( "text", QString::number( nbTriangles ) ); myWidgets[i2DTriangles][iTotal] ->setProperty( "text", QString::number( nbTriangles ) );
myWidgets[i2DTriangles][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Triangle] ) ); myWidgets[i2DTriangles][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Triangle] ) );
myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Triangle] + info[SMDSEntity_BiQuad_Triangle]) ); myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Triangle] ) );
myWidgets[i2DTriangles][iBiQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_BiQuad_Triangle] ) );
myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", QString::number( nbQuadrangles ) ); myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", QString::number( nbQuadrangles ) );
myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Quadrangle] ) ); myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Quadrangle] ) );
myWidgets[i2DQuadrangles][iQuadratic]->setProperty( "text", QString::number( info[SMDSEntity_Quad_Quadrangle] + info[SMDSEntity_BiQuad_Quadrangle] )); myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Quadrangle] ) );
myWidgets[i2DQuadrangles][iBiQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_BiQuad_Quadrangle] ) );
myWidgets[i2DPolygons][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Polygon] ) ); myWidgets[i2DPolygons][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Polygon] ) );
long nbTetrahedrons = info[SMDSEntity_Tetra] + info[SMDSEntity_Quad_Tetra]; long nbTetrahedrons = info[SMDSEntity_Tetra] + info[SMDSEntity_Quad_Tetra];
long nbHexahedrons = info[SMDSEntity_Hexa] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa]; long nbHexahedrons = info[SMDSEntity_Hexa] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa];
long nbPyramids = info[SMDSEntity_Pyramid] + info[SMDSEntity_Quad_Pyramid]; long nbPyramids = info[SMDSEntity_Pyramid] + info[SMDSEntity_Quad_Pyramid];
long nbPrisms = info[SMDSEntity_Penta] + info[SMDSEntity_Quad_Penta]; long nbPrisms = info[SMDSEntity_Penta] + info[SMDSEntity_Quad_Penta];
long nb3DLinear = info[SMDSEntity_Tetra] + info[SMDSEntity_Hexa] + info[SMDSEntity_Pyramid] + info[SMDSEntity_Penta] + info[SMDSEntity_Polyhedra] + info[SMDSEntity_Hexagonal_Prism]; long nb3DLinear = info[SMDSEntity_Tetra] + info[SMDSEntity_Hexa] + info[SMDSEntity_Pyramid] + info[SMDSEntity_Penta] + info[SMDSEntity_Polyhedra] + info[SMDSEntity_Hexagonal_Prism];
long nb3DQuadratic = info[SMDSEntity_Quad_Tetra] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa] + info[SMDSEntity_Quad_Pyramid] + info[SMDSEntity_Quad_Penta]; long nb3DQuadratic = info[SMDSEntity_Quad_Tetra] + info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_Quad_Pyramid] + info[SMDSEntity_Quad_Penta];
long nb3DBiQuadratic = info[SMDSEntity_TriQuad_Hexa];
myWidgets[i3D][iTotal] ->setProperty( "text", QString::number( nb3DLinear + nb3DQuadratic ) ); myWidgets[i3D][iTotal] ->setProperty( "text", QString::number( nb3DLinear + nb3DQuadratic ) );
myWidgets[i3D][iLinear] ->setProperty( "text", QString::number( nb3DLinear ) ); myWidgets[i3D][iLinear] ->setProperty( "text", QString::number( nb3DLinear ) );
myWidgets[i3D][iQuadratic] ->setProperty( "text", QString::number( nb3DQuadratic ) ); myWidgets[i3D][iQuadratic] ->setProperty( "text", QString::number( nb3DQuadratic ) );
myWidgets[i3D][iBiQuadratic] ->setProperty( "text", QString::number( nb3DBiQuadratic ) );
myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", QString::number( nbTetrahedrons ) ); myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", QString::number( nbTetrahedrons ) );
myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Tetra] ) ); myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Tetra] ) );
myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Tetra] ) ); myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Tetra] ) );
myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", QString::number( nbHexahedrons ) ); myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", QString::number( nbHexahedrons ) );
myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Hexa] ) ); myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Hexa] ) );
myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Hexa] + info[SMDSEntity_TriQuad_Hexa] ) ); myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Hexa] ) );
myWidgets[i3DHexahedrons][iBiQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_TriQuad_Hexa] ) );
myWidgets[i3DPyramids][iTotal] ->setProperty( "text", QString::number( nbPyramids ) ); myWidgets[i3DPyramids][iTotal] ->setProperty( "text", QString::number( nbPyramids ) );
myWidgets[i3DPyramids][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Pyramid] ) ); myWidgets[i3DPyramids][iLinear] ->setProperty( "text", QString::number( info[SMDSEntity_Pyramid] ) );
myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Pyramid] ) ); myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Pyramid] ) );
@ -521,12 +545,14 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
myWidgets[i3DPrisms][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Penta] ) ); myWidgets[i3DPrisms][iQuadratic] ->setProperty( "text", QString::number( info[SMDSEntity_Quad_Penta] ) );
myWidgets[i3DHexaPrisms][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Hexagonal_Prism] ) ); myWidgets[i3DHexaPrisms][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Hexagonal_Prism] ) );
myWidgets[i3DPolyhedrons][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Polyhedra] ) ); myWidgets[i3DPolyhedrons][iTotal] ->setProperty( "text", QString::number( info[SMDSEntity_Polyhedra] ) );
long nbElemTotal = info[SMDSEntity_0D] + info[SMDSEntity_Ball] + nbEdges + nb2DLinear + nb2DQuadratic + nb3DLinear + nb3DQuadratic; long nbElemTotal = info[SMDSEntity_0D] + info[SMDSEntity_Ball] + nbEdges + nb2DLinear + nb2DQuadratic + nb2DBiQuadratic + nb3DLinear + nb3DQuadratic + nb3DBiQuadratic;
long nbElemLinerial = info[SMDSEntity_Edge] + nb2DLinear + nb3DLinear; long nbElemLinerial = info[SMDSEntity_Edge] + nb2DLinear + nb3DLinear;
long nbElemQuadratic = info[SMDSEntity_Quad_Edge] + nb2DQuadratic + nb3DQuadratic; long nbElemQuadratic = info[SMDSEntity_Quad_Edge] + nb2DQuadratic + nb3DQuadratic;
long nbElemBiQuadratic = nb2DBiQuadratic + nb3DBiQuadratic;
myWidgets[iNb][iTotal] ->setProperty( "text", QString::number( nbElemTotal ) ); myWidgets[iNb][iTotal] ->setProperty( "text", QString::number( nbElemTotal ) );
myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( nbElemLinerial ) ); myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( nbElemLinerial ) );
myWidgets[iNb][iQuadratic] ->setProperty( "text", QString::number( nbElemQuadratic ) ); myWidgets[iNb][iQuadratic] ->setProperty( "text", QString::number( nbElemQuadratic ) );
myWidgets[iNb][iBiQuadratic]->setProperty( "text", QString::number( nbElemBiQuadratic ) );
// before full loading from study file, type of elements in a sub-mesh can't be defined // before full loading from study file, type of elements in a sub-mesh can't be defined
// in some cases // in some cases
bool infoOK = obj->IsMeshInfoCorrect(); bool infoOK = obj->IsMeshInfoCorrect();
@ -541,31 +567,37 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
hasAnyInfo = info[i]; hasAnyInfo = info[i];
if ( hasAnyInfo ) // believe it is a sub-mesh if ( hasAnyInfo ) // believe it is a sub-mesh
{ {
if ( nb2DLinear + nb2DQuadratic > 0 ) if ( nb2DLinear + nb2DQuadratic + nb2DBiQuadratic > 0 )
{ {
myWidgets[i2D][iLinear] ->setProperty( "text", "?" ); myWidgets[i2D][iLinear] ->setProperty( "text", "?" );
myWidgets[i2D][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2D][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2D][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iTotal] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iLinear] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iLinear] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DPolygons][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DPolygons][iTotal] ->setProperty( "text", "?" );
myWidgets[iNb][iTotal] ->setProperty( "text", "?" ); myWidgets[iNb][iTotal] ->setProperty( "text", "?" );
myWidgets[iNb][iLinear] ->setProperty( "text", "?" ); myWidgets[iNb][iLinear] ->setProperty( "text", "?" );
myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" ); myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" );
myWidgets[iNb][iBiQuadratic] ->setProperty( "text", "?" );
} }
else if ( nb3DLinear + nb3DQuadratic > 0 ) else if ( nb3DLinear + nb3DQuadratic + nb3DBiQuadratic > 0 )
{ {
myWidgets[i3D][iLinear] ->setProperty( "text", "?" ); myWidgets[i3D][iLinear] ->setProperty( "text", "?" );
myWidgets[i3D][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3D][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i3D][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", "?" ); myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", "?" );
myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", "?" ); myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", "?" );
myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iTotal] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iTotal] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iLinear] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iLinear] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", "?" );
@ -577,6 +609,7 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
myWidgets[iNb][iTotal] ->setProperty( "text", "?" ); myWidgets[iNb][iTotal] ->setProperty( "text", "?" );
myWidgets[iNb][iLinear] ->setProperty( "text", "?" ); myWidgets[iNb][iLinear] ->setProperty( "text", "?" );
myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" ); myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" );
myWidgets[iNb][iBiQuadratic] ->setProperty( "text", "?" );
} }
} }
else else
@ -590,12 +623,15 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
myWidgets[i2D][iTotal] ->setProperty( "text", "?" ); myWidgets[i2D][iTotal] ->setProperty( "text", "?" );
myWidgets[i2D][iLinear] ->setProperty( "text", "?" ); myWidgets[i2D][iLinear] ->setProperty( "text", "?" );
myWidgets[i2D][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2D][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2D][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iTotal] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iLinear] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iLinear] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DTriangles][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DQuadrangles][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i2DPolygons][iTotal] ->setProperty( "text", "?" ); myWidgets[i2DPolygons][iTotal] ->setProperty( "text", "?" );
myWidgets[i3D][iTotal] ->setProperty( "text", "?" ); myWidgets[i3D][iTotal] ->setProperty( "text", "?" );
myWidgets[i3D][iLinear] ->setProperty( "text", "?" ); myWidgets[i3D][iLinear] ->setProperty( "text", "?" );
@ -606,6 +642,7 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DHexahedrons][iBiQuadratic] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iTotal] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iTotal] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iLinear] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iLinear] ->setProperty( "text", "?" );
myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", "?" ); myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", "?" );
@ -617,6 +654,7 @@ void SMESHGUI_MeshInfo::showInfo( SMESH::SMESH_IDSource_ptr obj )
myWidgets[iNb][iTotal] ->setProperty( "text", "?" ); myWidgets[iNb][iTotal] ->setProperty( "text", "?" );
myWidgets[iNb][iLinear] ->setProperty( "text", "?" ); myWidgets[iNb][iLinear] ->setProperty( "text", "?" );
myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" ); myWidgets[iNb][iQuadratic] ->setProperty( "text", "?" );
myWidgets[iNb][iBiQuadratic] ->setProperty( "text", "?" );
} }
} }
} }
@ -662,22 +700,27 @@ void SMESHGUI_MeshInfo::clear()
myWidgets[i2D][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2D][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2D][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2D][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2D][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2D][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2D][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DTriangles][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DTriangles][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DTriangles][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DTriangles][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DTriangles][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DTriangles][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DQuadrangles][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DQuadrangles][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DQuadrangles][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DQuadrangles][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i2DPolygons][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i2DPolygons][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3D][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3D][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3D][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3D][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3D][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3D][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3D][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DTetrahedrons][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DTetrahedrons][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DTetrahedrons][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DHexahedrons][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DHexahedrons][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DHexahedrons][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DHexahedrons][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DPyramids][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DPyramids][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DPyramids][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DPyramids][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[i3DPyramids][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
@ -689,6 +732,7 @@ void SMESHGUI_MeshInfo::clear()
myWidgets[iNb][iTotal] ->setProperty( "text", QString::number( 0 ) ); myWidgets[iNb][iTotal] ->setProperty( "text", QString::number( 0 ) );
myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( 0 ) ); myWidgets[iNb][iLinear] ->setProperty( "text", QString::number( 0 ) );
myWidgets[iNb][iQuadratic] ->setProperty( "text", QString::number( 0 ) ); myWidgets[iNb][iQuadratic] ->setProperty( "text", QString::number( 0 ) );
myWidgets[iNb][iBiQuadratic] ->setProperty( "text", QString::number( 0 ) );
} }
/*! /*!
@ -763,6 +807,7 @@ void SMESHGUI_MeshInfo::saveInfo( QTextStream &out )
out << QString( SPACING_INFO, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[iNb][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[iNb][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[iNb][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[iNb][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[iNb][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[iNb][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[iNb][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "0D_LAB" ) << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "0D_LAB" ) << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i0D][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i0D][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "BALL_LAB" ) << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "BALL_LAB" ) << "\n";
@ -775,20 +820,24 @@ void SMESHGUI_MeshInfo::saveInfo( QTextStream &out )
out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2D][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2D][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2D][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2D][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2D][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2D][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[i2D][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "TRIANGLES_LAB" ) << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "TRIANGLES_LAB" ) << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DTriangles][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DTriangles][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2DTriangles][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2DTriangles][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DTriangles][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DTriangles][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DTriangles][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRANGLES_LAB" ) << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRANGLES_LAB" ) << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[i2DQuadrangles][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "POLYGONS_LAB" ) << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "POLYGONS_LAB" ) << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DPolygons][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i2DPolygons][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO, ' ' ) << tr( "3D_LAB" ) << "\n"; out << QString( SPACING_INFO, ' ' ) << tr( "3D_LAB" ) << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3D][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3D][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3D][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3D][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i3D][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i3D][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[i3D][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "TETRAHEDRONS_LAB" ) << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "TETRAHEDRONS_LAB" ) << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DTetrahedrons][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DTetrahedrons][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DTetrahedrons][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DTetrahedrons][iLinear]->property( "text" ) ).toString() << "\n";
@ -797,6 +846,7 @@ void SMESHGUI_MeshInfo::saveInfo( QTextStream &out )
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iLinear]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iQuadratic]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "QUADRATIC_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "BI_QUADRATIC_LAB" ) << ": " << ( myWidgets[i3DHexahedrons][iBiQuadratic]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*2, ' ' ) << tr( "PYRAMIDS_LAB" ) << "\n"; out << QString( SPACING_INFO*2, ' ' ) << tr( "PYRAMIDS_LAB" ) << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DPyramids][iTotal]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "TOTAL_LAB" ) << ": " << ( myWidgets[i3DPyramids][iTotal]->property( "text" ) ).toString() << "\n";
out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DPyramids][iLinear]->property( "text" ) ).toString() << "\n"; out << QString( SPACING_INFO*3, ' ' ) << tr( "LINEAR_LAB" ) << ": " << ( myWidgets[i3DPyramids][iLinear]->property( "text" ) ).toString() << "\n";

3
src/SMESHGUI/SMESHGUI_MeshInfo.h
View File

@ -108,7 +108,8 @@ class SMESHGUI_EXPORT SMESHGUI_MeshInfo : public QFrame
iSingle = 1, iSingle = 1,
iTotal = iSingle, iTotal = iSingle,
iLinear, iLinear,
iQuadratic iQuadratic,
iBiQuadratic
}; };
typedef QList<QWidget*> wlist; typedef QList<QWidget*> wlist;

52
src/SMESHGUI/SMESHGUI_MeshInfosBox.cxx
View File

@ -63,15 +63,15 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
my0DElem(0), my0DElem(0),
myBall(0), myBall(0),
myNbEdge(0), myNbLinEdge(0), myNbQuadEdge(0), myNbEdge(0), myNbLinEdge(0), myNbQuadEdge(0),
myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0), myNbTrai(0), myNbLinTrai(0), myNbQuadTrai(0), myNbBiQuadTrai(0),
myNbQuad(0), myNbLinQuad(0), myNbQuadQuad(0), myNbQuad(0), myNbLinQuad(0), myNbQuadQuad(0), myNbBiQuadQuad(0),
myNbFace(0), myNbLinFace(0), myNbQuadFace(0), myNbFace(0), myNbLinFace(0), myNbQuadFace(0), myNbBiQuadFace(0),
myNbPolyg(0), myNbPolyg(0),
myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(0), myNbHexa(0), myNbLinHexa(0), myNbQuadHexa(0), myNbBiQuadHexa(0),
myNbTetra(0),myNbLinTetra(0),myNbQuadTetra(0), myNbTetra(0),myNbLinTetra(0),myNbQuadTetra(0),
myNbPyra(0), myNbLinPyra(0), myNbQuadPyra(0), myNbPyra(0), myNbLinPyra(0), myNbQuadPyra(0),
myNbPrism(0),myNbLinPrism(0), myNbQuadPrism(0), myNbPrism(0),myNbLinPrism(0), myNbQuadPrism(0),
myNbVolum(0), myNbLinVolum(0), myNbQuadVolum(0), myNbVolum(0), myNbLinVolum(0), myNbQuadVolum(0), myNbBiQuadVolum(0),
myNbHexaPrism(0), myNbHexaPrism(0),
myNbPolyh(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 = new QLabel(tr("SMESH_MESHINFO_ORDER2"), this );
lab->setMinimumWidth(100); lab->setFont( italic ); lab->setMinimumWidth(100); lab->setFont( italic );
l->addWidget( lab, row, 3 ); 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 ) if ( myFull )
{ {
@ -174,6 +178,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
myNbQuadFace = new QLabel( this ); myNbQuadFace = new QLabel( this );
l->addWidget( myNbQuadFace, row, 3 ); l->addWidget( myNbQuadFace, row, 3 );
// -- // --
myNbBiQuadFace = new QLabel( this );
l->addWidget( myNbBiQuadFace, row, 4 );
// --
row++; // increment row count row++; // increment row count
// ... triangles // ... triangles
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_TRIANGLES")), this ); lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_TRIANGLES")), this );
@ -188,6 +195,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
myNbQuadTrai = new QLabel( this ); myNbQuadTrai = new QLabel( this );
l->addWidget( myNbQuadTrai, row, 3 ); l->addWidget( myNbQuadTrai, row, 3 );
// -- // --
myNbBiQuadTrai = new QLabel( this );
l->addWidget( myNbBiQuadTrai, row, 4 );
// --
row++; // increment row count row++; // increment row count
// ... quadrangles // ... quadrangles
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_QUADRANGLES")), this ); lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_QUADRANGLES")), this );
@ -202,6 +212,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
myNbQuadQuad = new QLabel( this ); myNbQuadQuad = new QLabel( this );
l->addWidget( myNbQuadQuad, row, 3 ); l->addWidget( myNbQuadQuad, row, 3 );
// -- // --
myNbBiQuadQuad = new QLabel( this );
l->addWidget( myNbBiQuadQuad, row, 4 );
// --
row++; // increment row count row++; // increment row count
// ... poligones // ... poligones
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_POLYGONES")), this ); lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_POLYGONES")), this );
@ -227,6 +240,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
myNbQuadVolum = new QLabel( this ); myNbQuadVolum = new QLabel( this );
l->addWidget( myNbQuadVolum, row, 3 ); l->addWidget( myNbQuadVolum, row, 3 );
// -- // --
myNbBiQuadVolum = new QLabel( this );
l->addWidget( myNbBiQuadVolum, row, 4 );
// --
row++; // increment row count row++; // increment row count
// ... tetras // ... tetras
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_TETRAS")), this ); lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_TETRAS")), this );
@ -255,6 +271,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
myNbQuadHexa = new QLabel( this ); myNbQuadHexa = new QLabel( this );
l->addWidget( myNbQuadHexa, row, 3 ); l->addWidget( myNbQuadHexa, row, 3 );
// -- // --
myNbBiQuadHexa = new QLabel( this );
l->addWidget( myNbBiQuadHexa, row, 4 );
// --
row++; // increment row count row++; // increment row count
// ... pyras // ... pyras
lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_PYRAS")), this ); lab = new QLabel(COLONIZE(tr("SMESH_MESHINFO_PYRAS")), this );
@ -359,6 +378,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
// -- // --
myNbQuadFace = new QLabel( this ); myNbQuadFace = new QLabel( this );
l->addWidget( myNbQuadFace, row, 3 ); l->addWidget( myNbQuadFace, row, 3 );
// --
myNbBiQuadFace = new QLabel( this );
l->addWidget( myNbBiQuadFace, row, 4 );
// volumes // volumes
row = l->rowCount(); // retrieve current row count row = l->rowCount(); // retrieve current row count
@ -374,6 +396,9 @@ SMESHGUI_MeshInfosBox::SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent
// -- // --
myNbQuadVolum = new QLabel( this ); myNbQuadVolum = new QLabel( this );
l->addWidget( myNbQuadVolum, row, 3 ); l->addWidget( myNbQuadVolum, row, 3 );
// --
myNbBiQuadVolum = new QLabel( this );
l->addWidget( myNbBiQuadVolum, row, 4 );
} }
} }
@ -412,7 +437,8 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
theInfo[SMDSEntity_Quadrangle] + theInfo[SMDSEntity_Quadrangle] +
theInfo[SMDSEntity_Polygon] )); theInfo[SMDSEntity_Polygon] ));
myNbQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] + myNbQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] +
theInfo[SMDSEntity_Quad_Quadrangle] + theInfo[SMDSEntity_Quad_Quadrangle] ));
myNbBiQuadFace ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Triangle] +
theInfo[SMDSEntity_BiQuad_Quadrangle] )); theInfo[SMDSEntity_BiQuad_Quadrangle] ));
// volumes // volumes
@ -435,8 +461,8 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
myNbQuadVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] + myNbQuadVolum ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Tetra] +
theInfo[SMDSEntity_Quad_Pyramid] + theInfo[SMDSEntity_Quad_Pyramid] +
theInfo[SMDSEntity_Quad_Hexa] + theInfo[SMDSEntity_Quad_Hexa] +
theInfo[SMDSEntity_TriQuad_Hexa] +
theInfo[SMDSEntity_Quad_Penta] )); theInfo[SMDSEntity_Quad_Penta] ));
myNbBiQuadVolum->setText( QString("%1").arg( theInfo[SMDSEntity_TriQuad_Hexa] ));
if ( myFull ) if ( myFull )
{ {
@ -445,15 +471,15 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
theInfo[SMDSEntity_Quad_Triangle] + theInfo[SMDSEntity_Quad_Triangle] +
theInfo[SMDSEntity_BiQuad_Triangle] )); theInfo[SMDSEntity_BiQuad_Triangle] ));
myNbLinTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] )); myNbLinTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Triangle] ));
myNbQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] + myNbQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Triangle] ));
theInfo[SMDSEntity_BiQuad_Triangle] )); myNbBiQuadTrai ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Triangle] ));
// quadrangles // quadrangles
myNbQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] + myNbQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] +
theInfo[SMDSEntity_Quad_Quadrangle] + theInfo[SMDSEntity_Quad_Quadrangle] +
theInfo[SMDSEntity_BiQuad_Quadrangle] )); theInfo[SMDSEntity_BiQuad_Quadrangle] ));
myNbLinQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] )); myNbLinQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quadrangle] ));
myNbQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Quadrangle] + myNbQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Quadrangle] ));
theInfo[SMDSEntity_BiQuad_Quadrangle])); myNbBiQuadQuad ->setText( QString("%1").arg( theInfo[SMDSEntity_BiQuad_Quadrangle]));
// poligones // poligones
myNbPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Polygon] )); myNbPolyg ->setText( QString("%1").arg( theInfo[SMDSEntity_Polygon] ));
@ -467,8 +493,8 @@ void SMESHGUI_MeshInfosBox::SetMeshInfo(const SMESH::long_array& theInfo)
theInfo[SMDSEntity_TriQuad_Hexa], theInfo[SMDSEntity_TriQuad_Hexa],
theInfo[SMDSEntity_Quad_Hexa] )); theInfo[SMDSEntity_Quad_Hexa] ));
myNbLinHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] )); myNbLinHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Hexa] ));
myNbQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Hexa] + myNbQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_Quad_Hexa] ));
theInfo[SMDSEntity_TriQuad_Hexa] )); myNbBiQuadHexa ->setText( QString("%1").arg( theInfo[SMDSEntity_TriQuad_Hexa] ));
// pyras // pyras
myNbPyra ->setText( QString("%1").arg( theInfo[SMDSEntity_Pyramid] + myNbPyra ->setText( QString("%1").arg( theInfo[SMDSEntity_Pyramid] +
theInfo[SMDSEntity_Quad_Pyramid] )); theInfo[SMDSEntity_Quad_Pyramid] ));

5
src/SMESHGUI/SMESHGUI_MeshInfosBox.h
View File

@ -59,16 +59,20 @@ private:
QLabel* myNbTrai; QLabel* myNbTrai;
QLabel* myNbLinTrai; QLabel* myNbLinTrai;
QLabel* myNbQuadTrai; QLabel* myNbQuadTrai;
QLabel* myNbBiQuadTrai;
QLabel* myNbQuad; QLabel* myNbQuad;
QLabel* myNbLinQuad; QLabel* myNbLinQuad;
QLabel* myNbQuadQuad; QLabel* myNbQuadQuad;
QLabel* myNbBiQuadQuad;
QLabel* myNbFace; QLabel* myNbFace;
QLabel* myNbLinFace; QLabel* myNbLinFace;
QLabel* myNbQuadFace; QLabel* myNbQuadFace;
QLabel* myNbBiQuadFace;
QLabel* myNbPolyg; QLabel* myNbPolyg;
QLabel* myNbHexa; QLabel* myNbHexa;
QLabel* myNbLinHexa; QLabel* myNbLinHexa;
QLabel* myNbQuadHexa; QLabel* myNbQuadHexa;
QLabel* myNbBiQuadHexa;
QLabel* myNbTetra; QLabel* myNbTetra;
QLabel* myNbLinTetra; QLabel* myNbLinTetra;
QLabel* myNbQuadTetra; QLabel* myNbQuadTetra;
@ -81,6 +85,7 @@ private:
QLabel* myNbVolum; QLabel* myNbVolum;
QLabel* myNbLinVolum; QLabel* myNbLinVolum;
QLabel* myNbQuadVolum; QLabel* myNbQuadVolum;
QLabel* myNbBiQuadVolum;
QLabel* myNbHexaPrism; QLabel* myNbHexaPrism;
QLabel* myNbPolyh; QLabel* myNbPolyh;
}; };

8
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -2040,6 +2040,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_ORDER3</source>
<translation>Bi-Quadratic</translation>
</message>
<message> <message>
<source>SMESH_MESHINFO_HEXAPRISM</source> <source>SMESH_MESHINFO_HEXAPRISM</source>
<translation>Hexagonal prisms</translation> <translation>Hexagonal prisms</translation>
@ -6915,6 +6919,10 @@ as they are of improper type:
<source>QUADRATIC_LAB</source> <source>QUADRATIC_LAB</source>
<translation>Quadratic</translation> <translation>Quadratic</translation>
</message> </message>
<message>
<source>BI_QUADRATIC_LAB</source>
<translation>Bi-Quadratic</translation>
</message>
<message> <message>
<source>0D_LAB</source> <source>0D_LAB</source>
<translation>0D:</translation> <translation>0D:</translation>

8
src/SMESHGUI/SMESH_msg_fr.ts
View File

@ -2040,6 +2040,10 @@ Référez-vous à la documentation sur l&apos;algorithme et la géométrie suppo
<source>SMESH_MESHINFO_ORDER2</source> <source>SMESH_MESHINFO_ORDER2</source>
<translation>Quadratique</translation> <translation>Quadratique</translation>
</message> </message>
<message>
<source>SMESH_MESHINFO_ORDER3</source>
<translation type="unfinished">Bi-Quadratic</translation>
</message>
<message> <message>
<source>SMESH_MESHINFO_HEXAPRISM</source> <source>SMESH_MESHINFO_HEXAPRISM</source>
<translation>Prismes hexagonaux</translation> <translation>Prismes hexagonaux</translation>
@ -6840,6 +6844,10 @@ en raison de leurs types incompatibles:
<source>QUADRATIC_LAB</source> <source>QUADRATIC_LAB</source>
<translation>Quadratique</translation> <translation>Quadratique</translation>
</message> </message>
<message>
<source>BI_QUADRATIC_LAB</source>
<translation type="unfinished">Bi-Quadratic</translation>
</message>
<message> <message>
<source>0D_LAB</source> <source>0D_LAB</source>
<translation>0D:</translation> <translation>0D:</translation>

8
src/SMESHGUI/SMESH_msg_ja.ts
View File

@ -2011,6 +2011,10 @@
<source>SMESH_MESHINFO_ORDER2</source> <source>SMESH_MESHINFO_ORDER2</source>
<translation>二次</translation> <translation>二次</translation>
</message> </message>
<message>
<source>SMESH_MESHINFO_ORDER3</source>
<translation type="unfinished">Bi-Quadratic</translation>
</message>
<message> <message>
<source>SMESH_MESHINFO_HEXAPRISM</source> <source>SMESH_MESHINFO_HEXAPRISM</source>
<translation>六角形プリズム</translation> <translation>六角形プリズム</translation>
@ -6718,6 +6722,10 @@
<source>QUADRATIC_LAB</source> <source>QUADRATIC_LAB</source>
<translation>二次</translation> <translation>二次</translation>
</message> </message>
<message>
<source>BI_QUADRATIC_LAB</source>
<translation type="unfinished">Bi-Quadratic</translation>
</message>
<message> <message>
<source>0D_LAB</source> <source>0D_LAB</source>
<translation>０D:</translation> <translation>０D:</translation>