préférences

This commit is contained in:
Gérald NICOLAS 2020-05-25 16:01:16 +02:00
parent c752294906
commit d05e8d5111
6 changed files with 115 additions and 96 deletions

View File

@ -411,49 +411,5 @@
<source>HOM_YACS_EDIT_WINDOW_TITLE</source> <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
<translation>Edition of a schema YACS</translation> <translation>Edition of a schema YACS</translation>
</message> </message>
<message>
<source>PREF_TAB_GENERAL</source>
<translation>General</translation>
</message>
<message>
<source>PREF_PUBLICATION</source>
<translation>Publication</translation>
</message>
<message>
<source>PREF_PUBLICATION_MAILLAGE_IN</source>
<translation>IN meshes</translation>
</message>
<message>
<source>PREF_PUBLICATION_MAILLAGE_OUT</source>
<translation>OUT meshes</translation>
</message>
<message>
<source>PREF_YACS</source>
<translation>YACS</translation>
</message>
<message>
<source>PREF_YACS_MAX</source>
<translation>Maximum numbers</translation>
</message>
<message>
<source>PREF_YACS_MAX_ITER</source>
<translation>Iterations</translation>
</message>
<message>
<source>PREF_YACS_MAX_NODE</source>
<translation>Nodes</translation>
</message>
<message>
<source>PREF_YACS_MAX_ELEM</source>
<translation>Elements</translation>
</message>
<message>
<source>PREF_YACS_CONVERGENCE</source>
<translation>Convergence</translation>
</message>
<message>
<source>PREF_YACS_TYPE_TEST</source>
<translation>Test type</translation>
</message>
</context> </context>
</TS> </TS>

View File

@ -1123,49 +1123,5 @@
<source>HOM_YACS_EDIT_WINDOW_TITLE</source> <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
<translation>Edition d'un schéma YACS</translation> <translation>Edition d'un schéma YACS</translation>
</message> </message>
<message>
<source>PREF_TAB_GENERAL</source>
<translation>Général</translation>
</message>
<message>
<source>PREF_PUBLICATION</source>
<translation>Publication</translation>
</message>
<message>
<source>PREF_PUBLICATION_MAILLAGE_IN</source>
<translation>Les maillages d'entrée</translation>
</message>
<message>
<source>PREF_PUBLICATION_MAILLAGE_OUT</source>
<translation>Les maillages de sortie</translation>
</message>
<message>
<source>PREF_YACS</source>
<translation>YACS</translation>
</message>
<message>
<source>PREF_YACS_MAX</source>
<translation>Nombres maximum</translation>
</message>
<message>
<source>PREF_YACS_MAX_ITER</source>
<translation>Itérations</translation>
</message>
<message>
<source>PREF_YACS_MAX_NODE</source>
<translation>Noeuds</translation>
</message>
<message>
<source>PREF_YACS_MAX_ELEM</source>
<translation>Eléments</translation>
</message>
<message>
<source>PREF_YACS_CONVERGENCE</source>
<translation>Convergence</translation>
</message>
<message>
<source>PREF_YACS_TYPE_TEST</source>
<translation>Type de test</translation>
</message>
</context> </context>
</TS> </TS>

View File

@ -42,6 +42,7 @@ INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient ${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/MEDWrapper ${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_SOURCE_DIR}/src/ADAPTGUI
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl ${PROJECT_BINARY_DIR}/idl
) )

View File

@ -94,6 +94,7 @@
#include "SMESHGUI_TransparencyDlg.h" #include "SMESHGUI_TransparencyDlg.h"
#include "SMESHGUI_Utils.h" #include "SMESHGUI_Utils.h"
#include "SMESHGUI_VTKUtils.h" #include "SMESHGUI_VTKUtils.h"
#include "ADAPTGUI.h"
#include "SMESH_version.h" #include "SMESH_version.h"
@ -5713,6 +5714,38 @@ void SMESHGUI::createPreferences()
setPreferenceProperty( coloringType, "indexes", indices ); setPreferenceProperty( coloringType, "indexes", indices );
addPreference( tr( "SMESH_DISTRIBUTION_COLOR" ), distributionGr, LightApp_Preferences::Color, "SMESH", "distribution_color" ); addPreference( tr( "SMESH_DISTRIBUTION_COLOR" ), distributionGr, LightApp_Preferences::Color, "SMESH", "distribution_color" );
// Adaptation tab ------------------------------------------------------------------------
int adaptTab = addPreference( tr( "ADAPT_PREF_TAB_GENERAL" ) );
int bloc, pref ;
// Refinement with HOMARD
bloc = addPreference( tr( "ADAPT_PREF_PUBLICATION" ), adaptTab );
setPreferenceProperty( bloc, "columns", 1 );
pref = addPreference( tr( "ADAPT_PREF_PUBLICATION_MAILLAGE_IN" ), bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_in" );
pref = addPreference( tr( "ADAPT_PREF_PUBLICATION_MAILLAGE_OUT" ), bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_out" );
bloc = addPreference( tr( "ADAPT_PREF_YACS_MAX" ), adaptTab );
setPreferenceProperty( bloc, "columns", 1 );
pref = addPreference( tr( "ADAPT_PREF_YACS_MAX_ITER" ), bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_iter" );
setPreferenceProperty( pref, "min", 0 );
setPreferenceProperty( pref, "max", 100000000 );
setPreferenceProperty( pref, "step", 1 );
pref = addPreference( tr( "ADAPT_PREF_YACS_MAX_NODE" ), bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_node" );
setPreferenceProperty( pref, "min", 0 );
setPreferenceProperty( pref, "max", 100000000 );
setPreferenceProperty( pref, "step", 1000 );
pref = addPreference( tr( "ADAPT_PREF_YACS_MAX_ELEM" ), bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_elem" );
setPreferenceProperty( pref, "min", 0 );
setPreferenceProperty( pref, "max", 100000000 );
setPreferenceProperty( pref, "step", 1000 );
bloc = addPreference( tr( "ADAPT_PREF_YACS_CONVERGENCE" ), adaptTab );
setPreferenceProperty( bloc, "columns", 1 );
pref = addPreference( tr( "ADAPT_PREF_YACS_TYPE_TEST" ), bloc, LightApp_Preferences::Selector, "HOMARD", "yacs_type_test" );
QStringList aListOfTypeTest;
aListOfTypeTest << "None";
aListOfTypeTest << "VTest > VRef";
aListOfTypeTest << "VTest < VRef";
setPreferenceProperty( pref, "strings", aListOfTypeTest );
} }
void SMESHGUI::preferencesChanged( const QString& sect, const QString& name ) void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
@ -5879,22 +5912,15 @@ LightApp_Operation* SMESHGUI::createOperation( const int id ) const
op = new SMESHGUI_SplitBiQuadOp(); op = new SMESHGUI_SplitBiQuadOp();
break; break;
case SMESHOp::OpUniformRefinement: case SMESHOp::OpUniformRefinement:
break;
case SMESHOp::OpHONewCase: case SMESHOp::OpHONewCase:
break;
case SMESHOp::OpHOCaseFollow: case SMESHOp::OpHOCaseFollow:
break;
case SMESHOp::OpHONewIter: case SMESHOp::OpHONewIter:
break;
case SMESHOp::OpHOIterCompute: case SMESHOp::OpHOIterCompute:
break;
case SMESHOp::OpHOIterComputePublish: case SMESHOp::OpHOIterComputePublish:
break;
case SMESHOp::OpHOEdit: case SMESHOp::OpHOEdit:
break;
case SMESHOp::OpHODelete: case SMESHOp::OpHODelete:
break;
case SMESHOp::OpMGAdapt: case SMESHOp::OpMGAdapt:
// op = new ADAPTGUI( id );
break; break;
case SMESHOp::OpConvertMeshToQuadratic: case SMESHOp::OpConvertMeshToQuadratic:
op = new SMESHGUI_ConvToQuadOp(); op = new SMESHGUI_ConvToQuadOp();

View File

@ -2929,6 +2929,46 @@ Check algorithm documentation for supported geometry</translation>
<source>SMESH_MULTICOLOR</source> <source>SMESH_MULTICOLOR</source>
<translation>Multicolor</translation> <translation>Multicolor</translation>
</message> </message>
<message>
<source>ADAPT_PREF_TAB_GENERAL</source>
<translation>Adaptation</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION</source>
<translation>Publication</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION_MAILLAGE_IN</source>
<translation>IN meshes</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION_MAILLAGE_OUT</source>
<translation>OUT meshes</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX</source>
<translation>Maximum numbers</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_ITER</source>
<translation>Iterations</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_NODE</source>
<translation>Nodes</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_ELEM</source>
<translation>Elements</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_CONVERGENCE</source>
<translation>Convergence</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_TYPE_TEST</source>
<translation>Test type</translation>
</message>
<message> <message>
<source>SMESH_VISU_PROBLEM</source> <source>SMESH_VISU_PROBLEM</source>
<translation>Mesh visualization failed</translation> <translation>Mesh visualization failed</translation>

View File

@ -2899,6 +2899,46 @@ Référez-vous à la documentation sur l&apos;algorithme et la géométrie suppo
<source>SMESH_MULTICOLOR</source> <source>SMESH_MULTICOLOR</source>
<translation>Multicouleur</translation> <translation>Multicouleur</translation>
</message> </message>
<message>
<source>ADAPT_PREF_TAB_GENERAL</source>
<translation>Adaptation</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION</source>
<translation>Publication</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION_MAILLAGE_IN</source>
<translation>Les maillages d'entrée</translation>
</message>
<message>
<source>ADAPT_PREF_PUBLICATION_MAILLAGE_OUT</source>
<translation>Les maillages de sortie</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX</source>
<translation>Nombres maximaux</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_ITER</source>
<translation>Itérations</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_NODE</source>
<translation>Noeuds</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_MAX_ELEM</source>
<translation>Eléments</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_CONVERGENCE</source>
<translation>Convergence</translation>
</message>
<message>
<source>ADAPT_PREF_YACS_TYPE_TEST</source>
<translation>Type de test</translation>
</message>
<message> <message>
<source>SMESH_VISU_PROBLEM</source> <source>SMESH_VISU_PROBLEM</source>
<translation>Impossible de visualiser le maillage, probablement à cause d&apos;un manque de mémoire</translation> <translation>Impossible de visualiser le maillage, probablement à cause d&apos;un manque de mémoire</translation>