mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-30 19:30:35 +05:00
0021859: SMESH : Add conversion from QUAD8 to QUAD9 and from HEXA20 to HEXA27
add criterion SMESH::FT_EntityType
This commit is contained in:
eap
parent
91a2b8aad9
commit
52ffb07d75
@ -1137,6 +1137,7 @@ bool SMESHGUI_FilterTable::IsValid (const bool theMess, const int theEntityType)
|
||||
aCriterion == SMESH::FT_BelongToCylinder ||
|
||||
aCriterion == SMESH::FT_BelongToGenSurface ||
|
||||
aCriterion == SMESH::FT_ElemGeomType ||
|
||||
aCriterion == SMESH::FT_EntityType ||
|
||||
aCriterion == SMESH::FT_CoplanarFaces ||
|
||||
aCriterion == SMESH::FT_LyingOnGeom)
|
||||
{
|
||||
@ -1253,6 +1254,8 @@ void SMESHGUI_FilterTable::GetCriterion (const int theRow,
|
||||
}
|
||||
else if ( aCriterionType == SMESH::FT_ElemGeomType )
|
||||
theCriterion.Threshold = (double)((ComboItem*)aTable->item(theRow, 2))->value();
|
||||
else if ( aCriterionType == SMESH::FT_EntityType )
|
||||
theCriterion.Threshold = (double)((ComboItem*)aTable->item(theRow, 2))->value();
|
||||
else if ( aCriterionType == SMESH::FT_CoplanarFaces )
|
||||
theCriterion.ThresholdID = aTable->text(theRow, 2).toLatin1().constData();
|
||||
else if ( aCriterionType != SMESH::FT_RangeOfIds &&
|
||||
@ -1329,6 +1332,11 @@ void SMESHGUI_FilterTable::SetCriterion (const int theRow,
|
||||
ComboItem* typeBox = (ComboItem*)aTable->item(theRow, 2);
|
||||
typeBox->setValue( (int)(theCriterion.Threshold + 0.5) );
|
||||
}
|
||||
else if (theCriterion.Type == SMESH::FT_EntityType )
|
||||
{
|
||||
ComboItem* typeBox = (ComboItem*)aTable->item(theRow, 2);
|
||||
typeBox->setValue( (int)(theCriterion.Threshold + 0.5) );
|
||||
}
|
||||
else if (theCriterion.Type == SMESH::FT_CoplanarFaces )
|
||||
{
|
||||
aTable->item( theRow, 2 )->setText( QString( theCriterion.ThresholdID ) );
|
||||
@ -1651,10 +1659,40 @@ static QList<int> geomTypes( const int theType )
|
||||
return typeIds;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
// name : entityTypes
|
||||
// Purpose : returns available entity types of elements
|
||||
//=======================================================================
|
||||
|
||||
static QList<int> entityTypes( const int theType )
|
||||
{
|
||||
QList<int> typeIds;
|
||||
|
||||
if ( theType == SMESH::EDGE )
|
||||
{
|
||||
typeIds.append( SMDSEntity_Edge );
|
||||
typeIds.append( SMDSEntity_Quad_Edge );
|
||||
}
|
||||
if ( theType == SMESH::FACE )
|
||||
{
|
||||
typeIds.append( SMDSEntity_Quadrangle );
|
||||
typeIds.append( SMDSEntity_Quad_Quadrangle );
|
||||
typeIds.append( SMDSEntity_BiQuad_Quadrangle );
|
||||
}
|
||||
if ( theType == SMESH::VOLUME )
|
||||
{
|
||||
typeIds.append( SMDSEntity_Hexa );
|
||||
typeIds.append( SMDSEntity_Quad_Hexa );
|
||||
typeIds.append( SMDSEntity_TriQuad_Hexa );
|
||||
}
|
||||
return typeIds;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
// name : SMESHGUI_FilterTable::onCriterionChanged()
|
||||
// Purpose : Provides reaction on change of criterion
|
||||
//=======================================================================
|
||||
|
||||
void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, const int entityType)
|
||||
{
|
||||
int aType = entityType == -1 ? GetType() : entityType;
|
||||
@ -1689,8 +1727,8 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
aCriterionType == SMESH::FT_Length2D ||
|
||||
aCriterionType == SMESH::FT_MaxElementLength2D ||
|
||||
aCriterionType == SMESH::FT_MaxElementLength3D ||
|
||||
aCriterionType == SMESH::FT_Volume3D;
|
||||
|
||||
aCriterionType == SMESH::FT_Volume3D ||
|
||||
aCriterionType == SMESH::FT_EntityType;
|
||||
int aPrecision = 0;
|
||||
if ( anIsDoubleCriterion ) {
|
||||
const char* aPrecisionType = getPrecision( aCriterionType );
|
||||
@ -1710,6 +1748,7 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
|
||||
if ( (aCriterionType != SMESH::FT_GroupColor && clrBtn) ||
|
||||
(aCriterionType != SMESH::FT_ElemGeomType && isComboItem) ||
|
||||
(aCriterionType != SMESH::FT_EntityType && isComboItem) ||
|
||||
(aCriterionType != SMESH::FT_MultiConnection && isIntSpinItem) ||
|
||||
(!anIsDoubleCriterion && isDoubleSpinItem) ||
|
||||
anIsPrecisionChanged )
|
||||
@ -1722,6 +1761,7 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
}
|
||||
if ( (aCriterionType == SMESH::FT_GroupColor && !clrBtn) ||
|
||||
(aCriterionType == SMESH::FT_ElemGeomType && !isComboItem) ||
|
||||
(aCriterionType == SMESH::FT_EntityType && !isComboItem) ||
|
||||
(aCriterionType == SMESH::FT_MultiConnection && !isIntSpinItem) ||
|
||||
(anIsDoubleCriterion && !isDoubleSpinItem) ||
|
||||
anIsPrecisionChanged )
|
||||
@ -1742,6 +1782,18 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
ComboItem* typeBox = new ComboItem( typeNames );
|
||||
aTable->setItem( row, 2, typeBox );
|
||||
}
|
||||
else if ( aCriterionType == SMESH::FT_EntityType ) {
|
||||
QList<int> typeIds = entityTypes( aType );
|
||||
QMap<int, QString> typeNames;
|
||||
QList<int>::const_iterator anIter = typeIds.begin();
|
||||
for ( int i = 0; anIter != typeIds.end(); ++anIter, ++i)
|
||||
{
|
||||
QString typeKey = QString( "ENTITY_TYPE_%1" ).arg( *anIter );
|
||||
typeNames[ *anIter ] = tr( typeKey.toLatin1().data() );
|
||||
}
|
||||
ComboItem* typeBox = new ComboItem( typeNames );
|
||||
aTable->setItem( row, 2, typeBox );
|
||||
}
|
||||
else if ( aCriterionType == SMESH::FT_MultiConnection ) {
|
||||
IntSpinItem* intSpin = new IntSpinItem( 0 );
|
||||
aTable->setItem( row, 2, intSpin );
|
||||
@ -1771,7 +1823,8 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
aCriterionType == SMESH::FT_LinearOrQuadratic ||
|
||||
aCriterionType == SMESH::FT_GroupColor ||
|
||||
aCriterionType == SMESH::FT_ElemGeomType ||
|
||||
aCriterionType == SMESH::FT_CoplanarFaces
|
||||
aCriterionType == SMESH::FT_CoplanarFaces ||
|
||||
aCriterionType == SMESH::FT_EntityType
|
||||
)
|
||||
{
|
||||
bool isSignalsBlocked = aTable->signalsBlocked();
|
||||
@ -1783,6 +1836,7 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
aTable->item(row, 2)->setText( QString("") );
|
||||
aTable->setEditable(aCriterionType == SMESH::FT_GroupColor ||
|
||||
aCriterionType == SMESH::FT_ElemGeomType ||
|
||||
aCriterionType == SMESH::FT_EntityType ||
|
||||
aCriterionType == SMESH::FT_CoplanarFaces, row, 2);
|
||||
aTable->blockSignals( isSignalsBlocked );
|
||||
}
|
||||
@ -1802,7 +1856,8 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
|
||||
aTable->setEditable(true, row, 2);
|
||||
}
|
||||
else if (aCriterionType == SMESH::FT_GroupColor ||
|
||||
aCriterionType == SMESH::FT_ElemGeomType)
|
||||
aCriterionType == SMESH::FT_ElemGeomType ||
|
||||
aCriterionType == SMESH::FT_EntityType)
|
||||
{
|
||||
if (!aTable->isEditable(row, 2))
|
||||
aTable->setEditable(true, row, 2);
|
||||
@ -2034,6 +2089,7 @@ const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
|
||||
aCriteria[ SMESH::FT_GroupColor ] = tr("GROUP_COLOR");
|
||||
aCriteria[ SMESH::FT_ElemGeomType ] = tr("GEOM_TYPE");
|
||||
aCriteria[ SMESH::FT_EqualEdges ] = tr("EQUAL_EDGE");
|
||||
aCriteria[ SMESH::FT_EntityType ] = tr("ENTITY_TYPE");
|
||||
}
|
||||
return aCriteria;
|
||||
}
|
||||
@ -2066,6 +2122,7 @@ const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
|
||||
aCriteria[ SMESH::FT_ElemGeomType ] = tr("GEOM_TYPE");
|
||||
aCriteria[ SMESH::FT_CoplanarFaces ] = tr("COPLANAR_FACES");
|
||||
aCriteria[ SMESH::FT_EqualFaces ] = tr("EQUAL_FACE");
|
||||
aCriteria[ SMESH::FT_EntityType ] = tr("ENTITY_TYPE");
|
||||
}
|
||||
return aCriteria;
|
||||
}
|
||||
@ -2087,6 +2144,7 @@ const QMap<int, QString>& SMESHGUI_FilterTable::getCriteria (const int theType)
|
||||
aCriteria[ SMESH::FT_GroupColor ] = tr("GROUP_COLOR");
|
||||
aCriteria[ SMESH::FT_ElemGeomType ] = tr("GEOM_TYPE");
|
||||
aCriteria[ SMESH::FT_EqualVolumes ] = tr("EQUAL_VOLUME");
|
||||
aCriteria[ SMESH::FT_EntityType ] = tr("ENTITY_TYPE");
|
||||
}
|
||||
return aCriteria;
|
||||
}
|
||||
|
||||
@ -4634,11 +4634,15 @@ Do you want to restore original submesh priority?</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>RADIOBTN_1</source>
|
||||
<translation>Convert to quadratic</translation>
|
||||
<translation>Convert to linear</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>RADIOBTN_2</source>
|
||||
<translation>Convert from quadratic</translation>
|
||||
<translation>Convert to quadratic</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>RADIOBTN_3</source>
|
||||
<translation>Convert to bi-quadratic</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>NON_CONFORM_WARNING</source>
|
||||
@ -5196,6 +5200,10 @@ Please check input data and try again</translation>
|
||||
<source>COPLANAR_FACES</source>
|
||||
<translation>Coplanar faces</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>NUMBEROFNODESINELEMENT</source>
|
||||
<translation>Number Of Nodes In Element</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>COPY_FROM</source>
|
||||
<translation>Copy from...</translation>
|
||||
@ -5216,10 +5224,6 @@ Please check input data and try again</translation>
|
||||
<source>EDGES</source>
|
||||
<translation>Edges</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE</source>
|
||||
<translation>Entity type</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>EQUAL_TO</source>
|
||||
<translation>Equal to</translation>
|
||||
@ -5367,6 +5371,98 @@ Please enter correct value and try again</translation>
|
||||
<source>ELEMENTS</source>
|
||||
<translation>Elements</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE</source>
|
||||
<translation>Entity type</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_0</source>
|
||||
<translation>POINT1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_2</source>
|
||||
<translation>SEG2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_3</source>
|
||||
<translation>SEG3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_4</source>
|
||||
<translation>TRIA3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_5</source>
|
||||
<translation>TRIA6</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_6</source>
|
||||
<translation>QUAD4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_7</source>
|
||||
<translation>QUAD8</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_8</source>
|
||||
<translation>QUAD9</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_9</source>
|
||||
<translation>TETRA4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_10</source>
|
||||
<translation>TETRA10</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_11</source>
|
||||
<translation>PYRA5</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_12</source>
|
||||
<translation>PYRA13</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_13</source>
|
||||
<translation>PENTA6</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_14</source>
|
||||
<translation>PENTA15</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_15</source>
|
||||
<translation>HEXA8</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_16</source>
|
||||
<translation>HEXA20</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_17</source>
|
||||
<translation>HEXA27</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_18</source>
|
||||
<translation>OCTA12</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_19</source>
|
||||
<translation>POLYGONE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_20</source>
|
||||
<translation>POLYEDRE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_21</source>
|
||||
<translation>NONE</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>ENTITY_TYPE_22</source>
|
||||
<translation>BALL</translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>GEOM_TYPE</source>
|
||||
<translation>Geometry type</translation>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user