préférences

diff --git a/src/ADAPTGUI/ADAPT_msg_en.ts b/src/ADAPTGUI/ADAPT_msg_en.ts
index 4d40ad891df35f7eb9fc33de0cdc7ce77bdfd541..1567033d6765bf59802800afb79fd8b33ffbb464 100644 (file)
--- a/src/ADAPTGUI/ADAPT_msg_en.ts
+++ b/src/ADAPTGUI/ADAPT_msg_en.ts
@@ -411,49 +411,5 @@
         <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
         <translation>Edition of a schema YACS</translation>
     </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>
 </TS>

diff --git a/src/ADAPTGUI/ADAPT_msg_fr.ts b/src/ADAPTGUI/ADAPT_msg_fr.ts
index 3306a69e73c6d64656947f5027af401cd1ef1dfb..f36da7b2401a982187417abcb31df57964ac8532 100644 (file)
--- a/src/ADAPTGUI/ADAPT_msg_fr.ts
+++ b/src/ADAPTGUI/ADAPT_msg_fr.ts
@@ -1123,49 +1123,5 @@
         <source>HOM_YACS_EDIT_WINDOW_TITLE</source>
         <translation>Edition d'un schéma YACS</translation>
     </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>
 </TS>

diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt
index 5bd61d945362367770305fa6fa2d4c41b73a3d97..c0252dca40f9d7d64415d54da8940ec6cefa2ad5 100644 (file)
--- a/src/SMESHGUI/CMakeLists.txt
+++ b/src/SMESHGUI/CMakeLists.txt
@@ -42,6 +42,7 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/Controls
   ${PROJECT_SOURCE_DIR}/src/SMESHClient
   ${PROJECT_SOURCE_DIR}/src/MEDWrapper
+  ${PROJECT_SOURCE_DIR}/src/ADAPTGUI
   ${PROJECT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
 )

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 5704acc4d550b721e7b8943b6cb0b97d1d41f729..18ce3d63809f70b3966572a212e4c8df2aa16222 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -94,6 +94,7 @@
 #include "SMESHGUI_TransparencyDlg.h"
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_VTKUtils.h"
+#include "ADAPTGUI.h"
 
 #include "SMESH_version.h"
 
@@ -5713,6 +5714,38 @@ void SMESHGUI::createPreferences()
   setPreferenceProperty( coloringType, "indexes", indices );
   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 )
@@ -5879,22 +5912,15 @@ LightApp_Operation* SMESHGUI::createOperation( const int id ) const
       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:
+//       op = new ADAPTGUI( id );
     break;
     case SMESHOp::OpConvertMeshToQuadratic:
       op = new SMESHGUI_ConvToQuadOp();

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 559c7e297c01525a1ab46162a0c12292c3ba0e24..dcb37827415aa0b63f529b62e424f61c6c38ea87 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -2929,6 +2929,46 @@ Check algorithm documentation for supported geometry</translation>
         <source>SMESH_MULTICOLOR</source>
         <translation>Multicolor</translation>
     </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>
         <source>SMESH_VISU_PROBLEM</source>
         <translation>Mesh visualization failed</translation>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index 18f64d3d382318b472bfeca7d30814b27c530928..809f898d9ed7b36885e12e271f734feac49edd13 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -2899,6 +2899,46 @@ Référez-vous à la documentation sur l'algorithme et la géométrie suppo
         <source>SMESH_MULTICOLOR</source>
         <translation>Multicouleur</translation>
     </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>
         <source>SMESH_VISU_PROBLEM</source>
         <translation>Impossible de visualiser le maillage, probablement à cause d&apos;un manque de mémoire</translation>