ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-03 22:55:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

0022100: EDF 2413 SMESH: Take into account TRIA7

Browse Source 
+  case 4137:     // BIQUADRATIC TRIANGLE

Support all types of elements in DAT format files
This commit is contained in:
eap 2013-05-16 17:15:56 +00:00
parent a41cfa6771
commit 50e4126336
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/SMESHGUI/SMESHGUI.cxx
View File

@ -487,20 +487,6 @@
if ( isDAT ) if ( isDAT )
{ {
format = "DAT"; format = "DAT";
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Quadrangle );
notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Quadrangle );
notSupportedElemTypes.push_back( SMESH::Entity_Polygon );
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Polygon );
notSupportedElemTypes.push_back( SMESH::Entity_Tetra );
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Tetra );
notSupportedElemTypes.push_back( SMESH::Entity_Pyramid );
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Pyramid );
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Hexa );
notSupportedElemTypes.push_back( SMESH::Entity_TriQuad_Hexa );
notSupportedElemTypes.push_back( SMESH::Entity_Penta );
notSupportedElemTypes.push_back( SMESH::Entity_Quad_Penta );
notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism );
notSupportedElemTypes.push_back( SMESH::Entity_Polyhedra );
notSupportedElemTypes.push_back( SMESH::Entity_0D ); notSupportedElemTypes.push_back( SMESH::Entity_0D );
notSupportedElemTypes.push_back( SMESH::Entity_Ball ); notSupportedElemTypes.push_back( SMESH::Entity_Ball );
} }
@ -528,11 +514,13 @@
{ {
format = "CGNS"; format = "CGNS";
notSupportedElemTypes.push_back( SMESH::Entity_Ball ); notSupportedElemTypes.push_back( SMESH::Entity_Ball );
notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Triangle );
} }
else if ( isSAUV ) else if ( isSAUV )
{ {
format = "SAUV"; format = "SAUV";
notSupportedElemTypes.push_back( SMESH::Entity_Ball ); notSupportedElemTypes.push_back( SMESH::Entity_Ball );
notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Triangle );
notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Quadrangle ); notSupportedElemTypes.push_back( SMESH::Entity_BiQuad_Quadrangle );
notSupportedElemTypes.push_back( SMESH::Entity_TriQuad_Hexa ); notSupportedElemTypes.push_back( SMESH::Entity_TriQuad_Hexa );
notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism ); notSupportedElemTypes.push_back( SMESH::Entity_Hexagonal_Prism );
@ -562,10 +550,11 @@
if ( !presentNotSupported.empty() ) if ( !presentNotSupported.empty() )
{ {
QString typeNames; QString typeNames;
const char* typeMsg[SMESH::Entity_Last] = { "SMESH_NODES", const char* typeMsg[SMESH::Entity_Last] = {
"SMESH_ELEMS0D","SMESH_EDGES","SMESH_QUADRATIC_EDGES","SMESH_TRIANGLES", "SMESH_NODES", "SMESH_ELEMS0D","SMESH_EDGES","SMESH_QUADRATIC_EDGES",
"SMESH_QUADRATIC_TRIANGLES","SMESH_QUADRANGLES","SMESH_QUADRATIC_QUADRANGLES", "SMESH_TRIANGLES", "SMESH_QUADRATIC_TRIANGLES", "SMESH_BIQUADRATIC_TRIANGLES",
"SMESH_BIQUADRATIC_QUADRANGLES","SMESH_POLYGONS","SMESH_QUADRATIC_POLYGONS", "SMESH_QUADRANGLES","SMESH_QUADRATIC_QUADRANGLES", "SMESH_BIQUADRATIC_QUADRANGLES",
"SMESH_POLYGONS","SMESH_QUADRATIC_POLYGONS",
"SMESH_TETRAHEDRA","SMESH_QUADRATIC_TETRAHEDRONS","SMESH_PYRAMIDS", "SMESH_TETRAHEDRA","SMESH_QUADRATIC_TETRAHEDRONS","SMESH_PYRAMIDS",
"SMESH_QUADRATIC_PYRAMIDS","SMESH_HEXAHEDRA","SMESH_QUADRATIC_HEXAHEDRONS", "SMESH_QUADRATIC_PYRAMIDS","SMESH_HEXAHEDRA","SMESH_QUADRATIC_HEXAHEDRONS",
"SMESH_TRIQUADRATIC_HEXAHEDRONS","SMESH_PENTAHEDRA","SMESH_QUADRATIC_PENTAHEDRONS", "SMESH_TRIQUADRATIC_HEXAHEDRONS","SMESH_PENTAHEDRA","SMESH_QUADRATIC_PENTAHEDRONS",
@ -3057,6 +3046,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
case 4035: // QUADRATIC TRIANGLE case 4035: // QUADRATIC TRIANGLE
case 4036: // QUADRATIC QUADRANGLE case 4036: // QUADRATIC QUADRANGLE
case 4136: // BIQUADRATIC QUADRANGLE case 4136: // BIQUADRATIC QUADRANGLE
case 4137: // BIQUADRATIC TRIANGLE
case 4037: // QUADRATIC TETRAHEDRON case 4037: // QUADRATIC TETRAHEDRON
case 4038: // QUADRATIC PYRAMID case 4038: // QUADRATIC PYRAMID
case 4039: // QUADRATIC PENTAHEDRON case 4039: // QUADRATIC PENTAHEDRON
@ -3077,6 +3067,8 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
type = SMDSEntity_Quad_Quadrangle; break; type = SMDSEntity_Quad_Quadrangle; break;
case 4136: case 4136:
type = SMDSEntity_BiQuad_Quadrangle; break; type = SMDSEntity_BiQuad_Quadrangle; break;
case 4137:
type = SMDSEntity_BiQuad_Triangle; break;
case 4037: case 4037:
type = SMDSEntity_Quad_Tetra; break; type = SMDSEntity_Quad_Tetra; break;
case 4038: case 4038:
@ -3675,6 +3667,7 @@ void SMESHGUI::initialize( CAM_Application* app )
createSMESHAction( 4035, "QUADRATIC_TRIANGLE", "ICON_DLG_QUADRATIC_TRIANGLE" ); createSMESHAction( 4035, "QUADRATIC_TRIANGLE", "ICON_DLG_QUADRATIC_TRIANGLE" );
createSMESHAction( 4036, "QUADRATIC_QUADRANGLE", "ICON_DLG_QUADRATIC_QUADRANGLE" ); createSMESHAction( 4036, "QUADRATIC_QUADRANGLE", "ICON_DLG_QUADRATIC_QUADRANGLE" );
createSMESHAction( 4136, "BIQUADRATIC_QUADRANGLE", "ICON_DLG_BIQUADRATIC_QUADRANGLE" ); createSMESHAction( 4136, "BIQUADRATIC_QUADRANGLE", "ICON_DLG_BIQUADRATIC_QUADRANGLE" );
createSMESHAction( 4137, "BIQUADRATIC_TRIANGLE", "ICON_DLG_BIQUADRATIC_TRIANGLE" );
createSMESHAction( 4037, "QUADRATIC_TETRAHEDRON", "ICON_DLG_QUADRATIC_TETRAHEDRON" ); createSMESHAction( 4037, "QUADRATIC_TETRAHEDRON", "ICON_DLG_QUADRATIC_TETRAHEDRON" );
createSMESHAction( 4038, "QUADRATIC_PYRAMID", "ICON_DLG_QUADRATIC_PYRAMID" ); createSMESHAction( 4038, "QUADRATIC_PYRAMID", "ICON_DLG_QUADRATIC_PYRAMID" );
createSMESHAction( 4039, "QUADRATIC_PENTAHEDRON", "ICON_DLG_QUADRATIC_PENTAHEDRON" ); createSMESHAction( 4039, "QUADRATIC_PENTAHEDRON", "ICON_DLG_QUADRATIC_PENTAHEDRON" );
@ -3873,6 +3866,7 @@ void SMESHGUI::initialize( CAM_Application* app )
createMenu( separator(), addId, -1 ); createMenu( separator(), addId, -1 );
createMenu( 4034, addId, -1 ); createMenu( 4034, addId, -1 );
createMenu( 4035, addId, -1 ); createMenu( 4035, addId, -1 );
createMenu( 4137, addId, -1 );
createMenu( 4036, addId, -1 ); createMenu( 4036, addId, -1 );
createMenu( 4136, addId, -1 ); createMenu( 4136, addId, -1 );
createMenu( 4037, addId, -1 ); createMenu( 4037, addId, -1 );
@ -3999,6 +3993,7 @@ void SMESHGUI::initialize( CAM_Application* app )
createTool( separator(), addRemTb ); createTool( separator(), addRemTb );
createTool( 4034, addRemTb ); createTool( 4034, addRemTb );
createTool( 4035, addRemTb ); createTool( 4035, addRemTb );
createTool( 4137, addRemTb );
createTool( 4036, addRemTb ); createTool( 4036, addRemTb );
createTool( 4136, addRemTb ); createTool( 4136, addRemTb );
createTool( 4037, addRemTb ); createTool( 4037, addRemTb );

2
src/SMESHGUI/SMESHGUI.h
View File

@ -203,7 +203,7 @@ private:
int addVtkFontPref( const QString&, int addVtkFontPref( const QString&,
const int, const int,
const QString&, const QString&,
const bool = false); const bool = false);
void connectView( const SUIT_ViewWindow* ); void connectView( const SUIT_ViewWindow* );