Menu de pilotage global

This commit is contained in:
GERALD NICOLAS 2020-05-20 10:47:58 +02:00
parent a1a1d918e4
commit 41d2fa239d
5 changed files with 233 additions and 1 deletions

View File

@ -3018,6 +3018,17 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
break;
}
case SMESHOp::OpSplitBiQuadratic:
case SMESHOp::OpUniformRefinement:
case SMESHOp::OpHONewCase:
case SMESHOp::OpHOCaseFollow:
case SMESHOp::OpHONewIter:
case SMESHOp::OpHOIterCompute:
case SMESHOp::OpHOIterComputePublish:
case SMESHOp::OpHOEdit:
case SMESHOp::OpHODelete:
case SMESHOp::OpMGAdapt:
case SMESHOp::OpConvertMeshToQuadratic:
case SMESHOp::OpCreateBoundaryElements: // create 2D mesh from 3D
case SMESHOp::OpReorientFaces:
@ -4252,6 +4263,17 @@ void SMESHGUI::initialize( CAM_Application* app )
createSMESHAction( SMESHOp::OpAutoColor, "AUTO_COLOR" );
createSMESHAction( SMESHOp::OpDisableAutoColor, "DISABLE_AUTO_COLOR" );
// Mesh adaptation
createSMESHAction( SMESHOp::OpUniformRefinement, "REF_ALL", "ICON_REF_ALL" );
createSMESHAction( SMESHOp::OpHONewCase, "HOMARD_CREATE_CASE", "ICON_HOMARD_CREATE_CASE" );
createSMESHAction( SMESHOp::OpHOCaseFollow, "HOMARD_FOLLOW_ITERATION", "ICON_HOMARD_FOLLOW_ITERATION" );
createSMESHAction( SMESHOp::OpHONewIter, "HOMARD_NEW_ITERATION", "ICON_HOMARD_NEW_ITERATION" );
createSMESHAction( SMESHOp::OpHOIterCompute, "HOMARD_COMPUTE", "ICON_HOMARD_COMPUTE" );
createSMESHAction( SMESHOp::OpHOIterComputePublish, "HOMARD_COMPUTE_PUBLISH", "ICON_HOMARD_COMPUTE_PUBLISH" );
createSMESHAction( SMESHOp::OpHOEdit, "EDIT", "ICON_DLG_EDIT_MESH" );
createSMESHAction( SMESHOp::OpHODelete, "DELETE", "ICON_DELETE" );
createSMESHAction( SMESHOp::OpMGAdapt, "MG_ADAPT", "ICON_MG_ADAPT" );
createSMESHAction( SMESHOp::OpMinimumDistance, "MEASURE_MIN_DIST", "ICON_MEASURE_MIN_DIST" );
createSMESHAction( SMESHOp::OpBoundingBox, "MEASURE_BND_BOX", "ICON_MEASURE_BND_BOX" );
createSMESHAction( SMESHOp::OpPropertiesLength, "MEASURE_LENGTH", "ICON_MEASURE_LENGTH" );
@ -4293,6 +4315,7 @@ void SMESHGUI::initialize( CAM_Application* app )
meshId = createMenu( tr( "MEN_MESH" ), -1, 70, 10 ),
ctrlId = createMenu( tr( "MEN_CTRL" ), -1, 60, 10 ),
modifyId = createMenu( tr( "MEN_MODIFY" ), -1, 40, 10 ),
adaptId = createMenu( tr( "MEN_ADAPT" ), -1, 80, 10 ),
measureId = createMenu( tr( "MEN_MEASURE" ), -1, 50, 10 ),
viewId = createMenu( tr( "MEN_VIEW" ), -1, 2 );
@ -4310,6 +4333,7 @@ void SMESHGUI::initialize( CAM_Application* app )
removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ),
//renumId = createMenu( tr( "MEN_RENUM" ), modifyId, 404 ),
transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ),
refHomardId = createMenu( tr( "MEN_REF_HOMARD" ), adaptId, -1, 10 ),
basicPropId = createMenu( tr( "MEN_BASIC_PROPERTIES" ), measureId, -1, 10 );
//createMenu( SMESHOp::OpImportDAT, importId, -1 );
@ -4465,6 +4489,18 @@ void SMESHGUI::initialize( CAM_Application* app )
createMenu( SMESHOp::OpSmoothing, modifyId, -1 );
createMenu( SMESHOp::OpPatternMapping, modifyId, -1 );
createMenu( SMESHOp::OpUniformRefinement, adaptId, -1 );
createMenu( SMESHOp::OpHONewCase, refHomardId, -1 );
createMenu( SMESHOp::OpHOCaseFollow, refHomardId, -1 );
createMenu( separator(), refHomardId, -1 );
createMenu( SMESHOp::OpHONewIter, refHomardId, -1 );
createMenu( SMESHOp::OpHOIterCompute, refHomardId, -1 );
createMenu( SMESHOp::OpHOIterComputePublish, refHomardId, -1 );
createMenu( separator(), refHomardId, -1 );
createMenu( SMESHOp::OpHOEdit, refHomardId, -1 );
createMenu( SMESHOp::OpHODelete, refHomardId, -1 );
createMenu( SMESHOp::OpMGAdapt, adaptId, -1 );
createMenu( SMESHOp::OpMinimumDistance, measureId, -1 );
createMenu( SMESHOp::OpBoundingBox, measureId, -1 );
createMenu( SMESHOp::OpAngle, measureId, -1 );
@ -4492,6 +4528,7 @@ void SMESHGUI::initialize( CAM_Application* app )
//renumbTb = createTool( tr( "TB_RENUMBER" ), QString( "SMESHRenumberingToolbar" ) ),
transformTb = createTool( tr( "TB_TRANSFORM" ), QString( "SMESHTransformationToolbar" ) ),
modifyTb = createTool( tr( "TB_MODIFY" ), QString( "SMESHModificationToolbar" ) ),
// adaptTb = createTool( tr( "TB_ADAPTATION" ),QString( "SMESHAdaptationToolbar" ) ),
measuremTb = createTool( tr( "TB_MEASUREM" ), QString( "SMESHMeasurementsToolbar" ) ),
dispModeTb = createTool( tr( "TB_DISP_MODE" ), QString( "SMESHDisplayModeToolbar" ) );
@ -4611,6 +4648,10 @@ void SMESHGUI::initialize( CAM_Application* app )
createTool( SMESHOp::OpSmoothing, modifyTb );
createTool( SMESHOp::OpPatternMapping, modifyTb );
// createTool( SMESHOp::OpUniformRefinement, adaptTb );
// createTool( SMESHOp::OpHOMARDRefinement, adaptTb );
// createTool( SMESHOp::OpMGAdapt, adaptTb );
createTool( SMESHOp::OpMinimumDistance, measuremTb );
createTool( SMESHOp::OpUpdate, dispModeTb );
@ -4689,6 +4730,9 @@ void SMESHGUI::initialize( CAM_Application* app )
popupMgr()->insert( separator(), -1, 0 );
createPopupItem( SMESHOp::OpClearMesh, OB, mesh );
//popupMgr()->insert( separator(), -1, 0 );
// createPopupItem( SMESHOp::OpUniformRefinement, OB, mesh );
// createPopupItem( SMESHOp::OpHOMARDRefinement, OB, mesh );
// createPopupItem( SMESHOp::OpMGAdapt, OB, mesh );
QString only_one_non_empty = QString( " && %1=1 && numberOfNodes>0" ).arg( dc );
QString multiple_non_empty = QString( " && %1>0 && numberOfNodes>0" ).arg( dc );
@ -5834,6 +5878,24 @@ LightApp_Operation* SMESHGUI::createOperation( const int id ) const
case SMESHOp::OpSplitBiQuadratic:
op = new SMESHGUI_SplitBiQuadOp();
break;
case SMESHOp::OpUniformRefinement:
break;
case SMESHOp::OpHONewCase:
break;
case SMESHOp::OpHOCaseFollow:
break;
case SMESHOp::OpHONewIter:
break;
case SMESHOp::OpHOIterCompute:
break;
case SMESHOp::OpHOIterComputePublish:
break;
case SMESHOp::OpHOEdit:
break;
case SMESHOp::OpHODelete:
break;
case SMESHOp::OpMGAdapt:
break;
case SMESHOp::OpConvertMeshToQuadratic:
op = new SMESHGUI_ConvToQuadOp();
break;

View File

@ -184,6 +184,16 @@ namespace SMESHOp {
OpConvertMeshToQuadratic = 4513, // MENU MODIFICATION - CONVERT TO/FROM QUADRATIC
OpCreateBoundaryElements = 4514, // MENU MODIFICATION - CREATE BOUNDARY ELEMENTS
OpSplitBiQuadratic = 4515, // MENU MODIFICATION - SPLIT BI-QUADRATIC TO LINEAR
// Adaptation ---------------------//--------------------------------
OpUniformRefinement = 8000, // MENU ADAPTATION - HOMARD - UNIFORM REFINEMENT
OpHONewCase = 8011, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - New Case
OpHOCaseFollow = 8012, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - New Case Follow
OpHONewIter = 8013, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - New Iteration
OpHOIterCompute = 8014, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - Compute Iteration
OpHOIterComputePublish = 8015, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - Compute Iteration and Publish
OpHOEdit = 8016, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - Edit objects
OpHODelete = 8017, // MENU ADAPTATION - HOMARD - FREE REFINEMENT - Delete objects
OpMGAdapt = 8020, // MENU ADAPTATION - MG-ADAPT
// Measurements -------------------//--------------------------------
OpPropertiesLength = 5000, // MENU MEASUREMENTS - BASIC PROPERTIES - LENGTH
OpPropertiesArea = 5001, // MENU MEASUREMENTS - BASIC PROPERTIES - AREA

View File

@ -79,6 +79,34 @@
<source>ICON_CREATE_GEO_GROUP</source>
<translation>mesh_groups_from_gemetry.png</translation>
</message>
<message>
<source>ICON_REF_ALL</source>
<translation>adapt_ref_all.png</translation>
</message>
<message>
<source>ICON_HOMARD_CREATE_CASE</source>
<translation>adapt_ref_homard.png</translation>
</message>
<message>
<source>ICON_HOMARD_FOLLOW_ITERATION</source>
<translation>adapt_hom_iter_poursuite.png</translation>
</message>
<message>
<source>ICON_HOMARD_NEW_ITERATION</source>
<translation>adapt_hom_iter_next</translation>
</message>
<message>
<source>ICON_HOMARD_COMPUTE</source>
<translation>mesh_compute.png</translation>
</message>
<message>
<source>ICON_HOMARD_COMPUTE_PUBLISH</source>
<translation>mesh_compute.png</translation>
</message>
<message>
<source>ICON_MG_ADAPT</source>
<translation>adapt_mg_adapt.png</translation>
</message>
<message>
<source>ICON_CONV_TO_QUAD</source>
<translation>mesh_conv_to_quad.png</translation>

View File

@ -332,6 +332,38 @@
<source>MEN_CONSTRUCT_GROUP</source>
<translation>Construct Group</translation>
</message>
<message>
<source>MEN_REF_ALL</source>
<translation>Uniform refinement</translation>
</message>
<message>
<source>MEN_REF_HOMARD</source>
<translation>Refinement with HOMARD</translation>
</message>
<message>
<source>MEN_HOMARD_CREATE_CASE</source>
<translation>New case</translation>
</message>
<message>
<source>MEN_HOMARD_FOLLOW_ITERATION</source>
<translation>Existing case</translation>
</message>
<message>
<source>MEN_HOMARD_NEW_ITERATION</source>
<translation>New iteration</translation>
</message>
<message>
<source>MEN_HOMARD_COMPUTE</source>
<translation>Compute</translation>
</message>
<message>
<source>MEN_HOMARD_COMPUTE_PUBLISH</source>
<translation>Compute and publish</translation>
</message>
<message>
<source>MEN_MG_ADAPT</source>
<translation>Remesh with MG_Adapt</translation>
</message>
<message>
<source>MEN_CONV_TO_QUAD</source>
<translation>Convert to/from quadratic</translation>
@ -780,6 +812,10 @@
<source>MEN_MODIFY</source>
<translation>Modification</translation>
</message>
<message>
<source>MEN_ADAPT</source>
<translation>Adaptation</translation>
</message>
<message>
<source>MEN_MEASURE</source>
<translation>Measurements</translation>
@ -1494,6 +1530,10 @@ Please enter correct values and try again</translation>
<source>SMESH_AVAILABLE</source>
<translation>Available</translation>
</message>
<message>
<source>SMESH_NOT_AVAILABLE</source>
<translation>Not available</translation>
</message>
<message>
<source>SMESH_AVAILABLE_ALGORITHMS</source>
<translation>Available algorithms</translation>
@ -3104,6 +3144,18 @@ Use Display Entity menu command to show them.
<source>STB_CONSTRUCT_GROUP</source>
<translation>Construct Group</translation>
</message>
<message>
<source>STB_REF_ALL</source>
<translation>Uniform refinement</translation>
</message>
<message>
<source>STB_REF_HOMARD</source>
<translation>Refinement with HOMARD</translation>
</message>
<message>
<source>STB_MG_ADAPT</source>
<translation>Remesh with MG_Adapt</translation>
</message>
<message>
<source>STB_CONV_TO_QUAD</source>
<translation>Convert to/from quadratic</translation>
@ -3700,6 +3752,10 @@ Use Display Entity menu command to show them.
<source>TB_CTRL3D</source>
<translation>Volume Controls Toolbar</translation>
</message>
<message>
<source>TB_ADAPTATION</source>
<translation>Adaptation Toolbar</translation>
</message>
<message>
<source>TB_MEASUREM</source>
<translation>Measurements Toolbar</translation>
@ -3804,6 +3860,18 @@ Use Display Entity menu command to show them.
<source>TOP_CONSTRUCT_GROUP</source>
<translation>Construct Group</translation>
</message>
<message>
<source>TOP_REF_ALL</source>
<translation>Uniform refinement</translation>
</message>
<message>
<source>TOP_REF_HOMARD</source>
<translation>Refinement with HOMARD</translation>
</message>
<message>
<source>TOP_MG_ADAPT</source>
<translation>Remesh with MG_Adapt</translation>
</message>
<message>
<source>TOP_CONV_TO_QUAD</source>
<translation>Convert to/from quadratic</translation>

View File

@ -474,7 +474,7 @@
</message>
<message>
<source>MEN_EDIT</source>
<translation>Edition</translation>
<translation>Editer</translation>
</message>
<message>
<source>MEN_EDIT_GROUP</source>
@ -780,6 +780,10 @@
<source>MEN_MODIFY</source>
<translation>Modification</translation>
</message>
<message>
<source>MEN_ADAPT</source>
<translation>Adaptation</translation>
</message>
<message>
<source>MEN_MEASURE</source>
<translation>Outils de mesure</translation>
@ -1108,6 +1112,38 @@
<source>MEN_TRANSF</source>
<translation>Transformation</translation>
</message>
<message>
<source>MEN_REF_ALL</source>
<translation>Raffinement uniforme</translation>
</message>
<message>
<source>MEN_REF_HOMARD</source>
<translation>Raffinement avec HOMARD</translation>
</message>
<message>
<source>MEN_HOMARD_CREATE_CASE</source>
<translation>Création d'un cas</translation>
</message>
<message>
<source>MEN_HOMARD_FOLLOW_ITERATION</source>
<translation>Poursuite d'une itération.</translation>
</message>
<message>
<source>MEN_HOMARD_NEW_ITERATION</source>
<translation>Création d'une itération</translation>
</message>
<message>
<source>MEN_HOMARD_COMPUTE</source>
<translation>Calculer</translation>
</message>
<message>
<source>MEN_HOMARD_COMPUTE_PUBLISH</source>
<translation>Calculer et publier</translation>
</message>
<message>
<source>MEN_MG_ADAPT</source>
<translation>Remaillage avec MG_Adapt</translation>
</message>
<message>
<source>MEN_TRANSP</source>
<translation>Transparence</translation>
@ -3079,6 +3115,18 @@ Utilisez le menu &quot;Visualiser une entité&quot; pour les afficher.
<source>STB_CONSTRUCT_GROUP</source>
<translation>Construire un groupe</translation>
</message>
<message>
<source>STB_REF_ALL</source>
<translation>Raffinement uniforme</translation>
</message>
<message>
<source>STB_REF_HOMARD</source>
<translation>Raffinement avec HOMARD</translation>
</message>
<message>
<source>STB_MG_ADAPT</source>
<translation>Remaillage avec MG_Adapt</translation>
</message>
<message>
<source>STB_CONV_TO_QUAD</source>
<translation>Convertir vers/de quadratique</translation>
@ -3671,6 +3719,10 @@ Utilisez le menu &quot;Visualiser une entité&quot; pour les afficher.
<source>TB_CTRL3D</source>
<translation>Barre des contrôles des volumes</translation>
</message>
<message>
<source>TB_ADAPTATION</source>
<translation>Barre de l'adaptation</translation>
</message>
<message>
<source>TB_MEASUREM</source>
<translation>Barre des mesures</translation>
@ -3775,6 +3827,18 @@ Utilisez le menu &quot;Visualiser une entité&quot; pour les afficher.
<source>TOP_CONSTRUCT_GROUP</source>
<translation>Construire un groupe</translation>
</message>
<message>
<source>TOP_REF_ALL</source>
<translation>Raffinement uniforme</translation>
</message>
<message>
<source>TOP_REF_HOMARD</source>
<translation>Raffinement avec HOMARD</translation>
</message>
<message>
<source>TOP_MG_ADAPT</source>
<translation>Remaillage avec MG_Adapt</translation>
</message>
<message>
<source>TOP_CONV_TO_QUAD</source>
<translation>Convertir vers/de quadratique</translation>