IMP: SMESH / Yams plug-in: Some more updates for porting to MGSurfOpt 1.1

diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui
index e34b7b7da1b09f05119bdf38cd8b4b4abb9a90de..9b573daf46fb3acc74173833d29925b2d852da69 100644 (file)
--- a/src/Tools/YamsPlug/YamsPlugDialog.ui
+++ b/src/Tools/YamsPlug/YamsPlugDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Yams : Remeshing tool</string>
+   <string>MGSurfOpt : Remeshing tool</string>
   </property>
   <property name="sizeGripEnabled" stdset="0">
    <bool>false</bool>
@@ -19,7 +19,7 @@
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
+     <item>
       <spacer name="horizontalSpacer_xx">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -34,7 +34,7 @@
         </size>
        </property>
       </spacer>
-         </item>
+     </item>
      <item>
       <widget class="QPushButton" name="PB_OK">
        <property name="text">
@@ -67,12 +67,12 @@
        <property name="text">
         <string>Save</string>
        </property>
-        <property name="iconSize">
-         <size>
-          <width>18</width>
-          <height>18</height>
-         </size>
-        </property>
+       <property name="iconSize">
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -80,12 +80,12 @@
        <property name="text">
         <string>Load</string>
        </property>
-        <property name="iconSize">
-         <size>
-          <width>18</width>
-          <height>18</height>
-         </size>
-        </property>
+       <property name="iconSize">
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
+       </property>
       </widget>
      </item>
      <item>
@@ -120,7 +120,7 @@
        </property>
       </widget>
      </item>
-         <item>
+     <item>
       <spacer name="horizontalSpacer_xx">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -135,7 +135,7 @@
         </size>
        </property>
       </spacer>
-         </item>
+     </item>
     </layout>
    </item>
    <item row="1" column="0">
@@ -164,156 +164,152 @@
        <property name="title">
         <string>Optimisation</string>
        </property>
-
-        <layout class="QHBoxLayout" name="RBLayoutopt">
-
-         <item>
-      <spacer name="horizontalSpacer_xx">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Minimum</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>30</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-         </item>
-
-         <item>
-        <layout class="QVBoxLayout" name="monRBLayout">
-         <item>
-          <widget class="QRadioButton" name="RB_0">
-           <property name="toolTip">
-            <string>Quality improvement is done by point smoothing and edge swapping.</string>
-           </property>
-           <property name="text">
-            <string>Quality improvement Only (0)</string>
-           </property>
-           <property name="checked">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB_G">
-           <property name="toolTip">
-            <string>The given surface triangulation is enriched (no coarsening at all) in such away that the distance 
+       <layout class="QHBoxLayout" name="RBLayoutopt">
+        <item>
+         <spacer name="horizontalSpacer_xx">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Minimum</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>30</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <layout class="QVBoxLayout" name="monRBLayout">
+          <item>
+           <widget class="QRadioButton" name="RB_0">
+            <property name="toolTip">
+             <string>Quality improvement is done by point smoothing and edge swapping.</string>
+            </property>
+            <property name="text">
+             <string>Quality improvement Only </string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB_G">
+            <property name="toolTip">
+             <string>The given surface triangulation is enriched (no coarsening at all) in such away that the distance 
 between the elements in the final mesh and those of the initial one is bounded by auser specified tolerance value. 
 One should use this option, to enrich the mesh where purely
 geometrical features may be insuficiently fine, i.e. the resulting mesh will be least as fine as the input.
 Mesh and the geometric features will be refined if needed as specified by the other program parameters.
 The meshes obtained with those settings may not be suitable for computation.</string>
-           </property>
-           <property name="text">
-            <string>Pure Geometry Enrichment (G)</string>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB_U">
-           <property name="toolTip">
-            <string>An uniform subdivision of the given surface triangulation is performed : 
+            </property>
+            <property name="text">
+             <string>Pure Geometry Enrichment </string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB_U">
+            <property name="toolTip">
+             <string>An uniform subdivision of the given surface triangulation is performed : 
 each triangle of the given surface triangulation is considered at and
 is divided into identical triangles.</string>
-           </property>
-           <property name="text">
-            <string>Uniform Subdivision (U)</string>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB_S">
-           <property name="toolTip">
-            <string>A surface sandpapering without shrinkage of the given surface
+            </property>
+            <property name="text">
+             <string>Uniform Subdivision </string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB_S">
+            <property name="toolTip">
+             <string>A surface sandpapering without shrinkage of the given surface
 triangulation is performed, i.e., the high curvature variations of the
 given surface will be smoothed out without shrinking the volume in
 doing so. If ridges are defined, they will be kept as they are in the
 resulting mesh.
 This option modifies the geometry.</string>
-           </property>
-           <property name="text">
-            <string>Sandpapering (S)</string>
-           </property>
-           <property name="checked">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB__2">
-           <property name="toolTip">
-            <string>The given surface triangulation is modified in such a way that the distance between 
+            </property>
+            <property name="text">
+             <string>Sandpapering</string>
+            </property>
+            <property name="checked">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB__2">
+            <property name="toolTip">
+             <string>The given surface triangulation is modified in such a way that the distance between 
 the elements in the final mesh and those of the initial one is bounded by a user specfied tolerance value.
 One should use this option, to coarsen when a purely geometrical mesh is needed. (a mesh that keeps
 and obeys its geometric features only.) The meshes obtained with this option are usually not suitable
 for computation because anisotropic elements may be generated</string>
-           </property>
-           <property name="text">
-            <string>Geometrical Mesh : Coarsening (-2)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB_2">
-           <property name="toolTip">
-            <string>The given surface triangulation is modified in such a way that the distance between 
+            </property>
+            <property name="text">
+             <string>Geometrical Mesh : Coarsening</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB_2">
+            <property name="toolTip">
+             <string>The given surface triangulation is modified in such a way that the distance between 
 the elements in the final mesh and those of the initial one is bounded by a user specfied tolerance value.
 One should use this option, to coarsen and enrich when a purely geometrical mesh is needed. (a mesh that keeps
 and obeys its geometric features only.) The meshes obtained with this setting are usually not suitable
 for computation because anisotropic elements may be generated</string>
-           </property>
-           <property name="text">
-            <string>Geometrical Mesh : Coarsening and Enrichment (2)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB__1">
-           <property name="toolTip">
-            <string>The given surface triangulation is modified in accordance to a size map. 
+            </property>
+            <property name="text">
+             <string>Geometrical Mesh : Coarsening and Enrichment</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB__1">
+            <property name="toolTip">
+             <string>The given surface triangulation is modified in accordance to a size map. 
 The latter can be either the intrinsic size map (computed automatically
 and based on the surface properties, i.e. the local curvatures),
 or on a given size map (which is then combined to the intrinsic size map). 
 One should use this option to coarsen  the mesh, when a regular mesh 
 for computation purposes is desired, i.e. a mesh with good aspect ratios or 
 good quality elements.</string>
-           </property>
-           <property name="text">
-            <string>Mesh for finite element computation : Coarsening (-1)</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QRadioButton" name="RB_1">
-           <property name="toolTip">
-            <string>The given surface triangulation is modified in accordance to a size map. 
+            </property>
+            <property name="text">
+             <string>Mesh for finite element computation : Coarsening</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RB_1">
+            <property name="toolTip">
+             <string>The given surface triangulation is modified in accordance to a size map. 
 The latter can be either the intrinsic size map (computed automatically
 and based on the surface properties, i.e. the local curvatures),
 or on a given size map (which is then combined to the intrinsic size map). 
 One should use this option to coarse and enrich the mesh, when a regular mesh 
 for computation purposes is desired, i.e. a mesh with good aspect ratios or 
 good quality elements</string>
-           </property>
-           <property name="text">
-            <string>Mesh for finite element computation : Coarsening and Enrichment (1)</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-
+            </property>
+            <property name="text">
+             <string>Mesh for finite element computation : Coarsening and Enrichment</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
       </widget>
       <widget class="QGroupBox" name="GBUnit">
        <property name="geometry">
@@ -494,6 +490,7 @@ If the Units parameter is absolute, the tolerance parameter is expressed in mode
         </property>
        </widget>
       </widget>
+      <zorder>GBUnit</zorder>
       <zorder>groupBox</zorder>
       <zorder>GBOptim</zorder>
      </widget>
@@ -558,7 +555,6 @@ or add vertices (refines) to change the mesh.</string>
          <bool>true</bool>
         </property>
        </widget>
-
        <widget class="QCheckBox" name="CB_SplitEdge">
         <property name="geometry">
          <rect>
@@ -580,8 +576,6 @@ New created vertices are saved in the .mesh file under keyword section 'Vertices
          <bool>false</bool>
         </property>
        </widget>
-
-
       </widget>
       <widget class="QGroupBox" name="groupBox_5">
        <property name="geometry">
@@ -595,7 +589,6 @@ New created vertices are saved in the .mesh file under keyword section 'Vertices
        <property name="title">
         <string>You can control</string>
        </property>
-##1
        <widget class="QDoubleSpinBox" name="SP_Geomapp">
         <property name="geometry">
          <rect>
@@ -606,13 +599,13 @@ New created vertices are saved in the .mesh file under keyword section 'Vertices
          </rect>
         </property>
         <property name="maximum">
-         <double>0.89</double>
+         <double>0.890000000000000</double>
         </property>
         <property name="singleStep">
-         <double>0.01</double>
+         <double>0.010000000000000</double>
         </property>
         <property name="value">
-         <double>0.04</double>
+         <double>0.040000000000000</double>
         </property>
        </widget>
        <widget class="QLabel" name="label_2">
@@ -646,7 +639,6 @@ faces.</string>
 Maximum angle allowed between a face and a curve (not separated by a ridge).</string>
         </property>
        </widget>
-##2
        <widget class="QDoubleSpinBox" name="SP_Ridge">
         <property name="geometry">
          <rect>
@@ -657,10 +649,10 @@ Maximum angle allowed between a face and a curve (not separated by a ridge).</st
          </rect>
         </property>
         <property name="maximum">
-         <double>90.</double>
+         <double>90.000000000000000</double>
         </property>
         <property name="value">
-         <double>45.</double>
+         <double>45.000000000000000</double>
         </property>
        </widget>
        <widget class="QLabel" name="label_4">
@@ -677,7 +669,6 @@ Maximum angle allowed between a face and a curve (not separated by a ridge).</st
 the edge common to the faces is a ridge.</string>
         </property>
        </widget>
-##3
        <widget class="QDoubleSpinBox" name="SP_MaxSize">
         <property name="geometry">
          <rect>
@@ -688,16 +679,16 @@ the edge common to the faces is a ridge.</string>
          </rect>
         </property>
         <property name="minimum">
-         <double>0.01</double>
+         <double>0.010000000000000</double>
         </property>
         <property name="maximum">
-         <double>100.</double>
+         <double>100.000000000000000</double>
         </property>
         <property name="singleStep">
-         <double>0.1</double>
+         <double>0.100000000000000</double>
         </property>
         <property name="value">
-         <double>100.</double>
+         <double>100.000000000000000</double>
         </property>
        </widget>
        <widget class="QLabel" name="label_5">
@@ -723,7 +714,6 @@ size  may be slightly bigger than the prescribed ones.</string>
 the lengths of the edges with respect to the specified size map.</string>
         </property>
        </widget>
-##4
        <widget class="QDoubleSpinBox" name="SP_MinSize">
         <property name="geometry">
          <rect>
@@ -734,16 +724,16 @@ the lengths of the edges with respect to the specified size map.</string>
          </rect>
         </property>
         <property name="minimum">
-         <double>0.</double>
+         <double>0.000000000000000</double>
         </property>
         <property name="maximum">
-         <double>100.</double>
+         <double>100.000000000000000</double>
         </property>
         <property name="singleStep">
-         <double>0.1</double>
+         <double>0.100000000000000</double>
         </property>
         <property name="value">
-         <double>5.</double>
+         <double>5.000000000000000</double>
         </property>
        </widget>
        <widget class="QLabel" name="label_9">
@@ -769,7 +759,6 @@ size  may be slightly bigger than the prescribed ones.</string>
 the lengths of the edges with respect to the specified size map.</string>
         </property>
        </widget>
-##5
        <widget class="QDoubleSpinBox" name="SP_Gradation">
         <property name="geometry">
          <rect>
@@ -780,10 +769,10 @@ the lengths of the edges with respect to the specified size map.</string>
          </rect>
         </property>
         <property name="singleStep">
-         <double>0.01</double>
+         <double>0.010000000000000</double>
         </property>
         <property name="value">
-         <double>1.3</double>
+         <double>1.300000000000000</double>
         </property>
        </widget>
        <widget class="QLabel" name="label_3">
@@ -827,8 +816,7 @@ Yams will avoid having two adjacent edges which sizes vary more than the given g
        <property name="title">
         <string>Yams Generic Options</string>
        </property>
-       
-          <widget class="QSpinBox" name="SP_Verbosity">
+       <widget class="QSpinBox" name="SP_Verbosity">
         <property name="geometry">
          <rect>
           <x>20</x>
@@ -837,15 +825,14 @@ Yams will avoid having two adjacent edges which sizes vary more than the given g
           <height>25</height>
          </rect>
         </property>
-           <property name="maximum">
-            <number>10</number>
-           </property>
-           <property name="value">
-            <number>3</number>
-           </property>
-          </widget>
-       
-          <widget class="QLabel" name="label">
+        <property name="maximum">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>3</number>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label">
         <property name="geometry">
          <rect>
           <x>130</x>
@@ -859,12 +846,11 @@ Yams will avoid having two adjacent edges which sizes vary more than the given g
 From 0 (no detail) to 10 (very detailed).
 Default is 3.</string>
         </property>
-           <property name="text">
-            <string>Verbosity level</string>
-           </property>
-          </widget>
-       
-          <widget class="QSpinBox" name="SP_Memory">
+        <property name="text">
+         <string>Verbosity level</string>
+        </property>
+       </widget>
+       <widget class="QSpinBox" name="SP_Memory">
         <property name="geometry">
          <rect>
           <x>20</x>
@@ -873,16 +859,15 @@ Default is 3.</string>
           <height>25</height>
          </rect>
         </property>
-           <property name="maximum">
-            <number>100000</number>
-           </property>
-           <property name="value">
-            <number>0</number>
-           </property>
-          </widget>
-       
-          <widget class="QLabel" name="label_6">
-       <property name="geometry">
+        <property name="maximum">
+         <number>100000</number>
+        </property>
+        <property name="value">
+         <number>0</number>
+        </property>
+       </widget>
+       <widget class="QLabel" name="label_6">
+        <property name="geometry">
          <rect>
           <x>130</x>
           <y>70</y>
@@ -890,11 +875,8 @@ Default is 3.</string>
           <height>30</height>
          </rect>
         </property>
-           <property name="text">
-            <string>Memory size (in Mbytes)</string>
-           </property>
-           <property name="toolTip">
-            <string>The program requires roughly about 370 bytes per point. It is thus possible to estimate a priori 
+        <property name="toolTip">
+         <string>The program requires roughly about 370 bytes per point. It is thus possible to estimate a priori 
 the required memory size to complete a job. As an example of memory space needed, a mesh 
 of 543,652 points (1,087,716 triangles) requires 182 Mbytes (about 351 bytes per point). Conversely, 
 a workstation having 512 Mbytes of memory can handle a mesh of about 2,750,000 points.
@@ -907,9 +889,11 @@ Specify the memory if:
 - you want to limit the amount of memory used by the program.
 If the input mesh size requires more memory than requested or if the allocated memory (user defined or not)
 exceeds the machine capabilities, the tool will stop because of insufficient memory.</string>
-           </property>
-          </widget>
-        
+        </property>
+        <property name="text">
+         <string>Memory size (in Mbytes)</string>
+        </property>
+       </widget>
       </widget>
       <widget class="QGroupBox" name="groupBox_6">
        <property name="geometry">
@@ -959,8 +943,7 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
          </rect>
         </property>
        </widget>
-       
-      <widget class="QPushButton" name="PB_Save">
+       <widget class="QPushButton" name="PB_Save">
         <property name="geometry">
          <rect>
           <x>20</x>
@@ -969,18 +952,17 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
           <height>31</height>
          </rect>
         </property>
-       <property name="text">
-        <string>Save</string>
-       </property>
+        <property name="text">
+         <string>Save</string>
+        </property>
         <property name="iconSize">
          <size>
           <width>18</width>
           <height>18</height>
          </size>
         </property>
-      </widget>
-
-      <widget class="QPushButton" name="PB_Load">
+       </widget>
+       <widget class="QPushButton" name="PB_Load">
         <property name="geometry">
          <rect>
           <x>120</x>
@@ -989,17 +971,16 @@ exceeds the machine capabilities, the tool will stop because of insufficient mem
           <height>31</height>
          </rect>
         </property>
-       <property name="text">
-        <string>Load</string>
-       </property>
+        <property name="text">
+         <string>Load</string>
+        </property>
         <property name="iconSize">
          <size>
           <width>18</width>
           <height>18</height>
          </size>
         </property>
-      </widget>
-       
+       </widget>
       </widget>
      </widget>
     </widget>

diff --git a/src/Tools/YamsPlug/doc/Mandatory_params.rst b/src/Tools/YamsPlug/doc/Mandatory_params.rst
index f657c1d92221d9e3c95db325156b4d5f76a05b75..9a84bdc5e4a77ad8212366e7034c6cef2e2faeb3 100644 (file)
--- a/src/Tools/YamsPlug/doc/Mandatory_params.rst
+++ b/src/Tools/YamsPlug/doc/Mandatory_params.rst
@@ -4,8 +4,8 @@ Simple Remeshing Options
 simple case 
 -----------
 
-   All options, but the input mesh, have default values. however, **you have to specified these
-   simple options in order to drive yams and control remeshing parameters**. 
+   All options, but the input mesh, have default values. however, **you have to specify these
+   simple options in order to drive MG-SurfOpt and control remeshing parameters**. 
 
    You can access Distene documentation by clicking on Help button.
 
@@ -22,54 +22,57 @@ simple case
 Optimisation
 ------------
     
-This is the main remeshing Option.  Yams always does quality improvement. It is done by point smooting and edge swapping.  It can produce a regular mesh for finite element computation (initial mesh is a a geometrical mesh). In this case, the given surface trianglation is modified in accordance to a size map : an intrinsic size map is computed automatically. it is based on the surface proporties.  Yams is also able to  produce a geometrical mesh (initial mesh is a a mesh for finite element computation). In both case, It can coarsen or enrich the mesh.     
+This is the main remeshing Option.  SurfOpt always does quality improvement. It is done by point smooting and edge swapping.  It can produce a regular mesh for finite element computation (initial mesh is a a geometrical mesh). In this case, the given surface trianglation is modified in accordance to a size map : an intrinsic size map is computed automatically. it is based on the surface proporties.  SurfOpt is also able to  produce a geometrical mesh (initial mesh is a a mesh for finite element computation). In both case, It can coarsen or enrich the mesh.     
 
    - **Quality improvement** 
 
-     If you activitate this option, Yams does only quality improvement.  
+     If you activitate this option, SurfOpt does only quality improvement.  
 
-     It is equivalent to Yams's batch option 0.
+     It is equivalent to SurfOpt's batch option *- - optimisation only*.
 
    - **Pure Geometry Enrichement**
 
      The given surface triangulation is enriched (no coarsening at all) in such away that the distance between the elements in the final mesh and those of the initial one is bounded by auser specified tolerance value. One should use this option, to enrich the mesh where purely geometrical features may be insuficiently fine, i.e. the resulting mesh will be least as fine as the input. Mesh and the geometric features will be refined if needed as specified by the other program parameters. The meshes obtained with those settings may not be suitable for computation.
 
-     It is equivalent to Yams's batch option G.
+     It is equivalent to SurfOpt's batch option G.
 
    -  **Uniform subdivision**
 
      A uniform subdivision of the given surface triangulation is performed : each triangle of the given surface triangulation is considered at and is divided into identical triangles.
 
-     It is equivalent to Yams's batch option U.
+     It is equivalent to SurfOpt's batch option *- - uniform_flat_subdivision yes*.
 
    - **Smoothing**
 
      A surface sandpapering without shrinkage of the given surface triangulation is performed, i.e., the high curvature variations of the given surface will be smoothed out without shrinking the volume in doing so. If ridges are defined, they will be kept as they are in the resulting mesh. It could modify the geometry.
-     It is equivalent to Yams's batch option S.
+     It is equivalent to SurfOpt's batch option *- - sand_paper yes*.
 
    - **Geometrical Mesh : Coarsening** 
 
-     The given surface triangulation is modified in such a way that the distance between the elements in the final mesh and those of the initial one is bounded by a user specfied tolerance value.One should use this option, to coarsen when a purely geometrical mesh is needed. (a mesh that keeps and obeys its geometric features only.) The meshes obtained with this option are usually not suitable for computation because anisotropic elements may be generated
+     The given surface triangulation is modified in such a way that the distance between the elements in the final mesh 
+     and those of the initial one is bounded by a user specfied tolerance value.
+     One should use this option, to coarsen when a purely geometrical mesh is needed. (a mesh that keeps and obeys its geometric features only.) 
+     The meshes obtained with this option are usually not suitable for computation because anisotropic elements may be generated
 
-     It is equivalent to Yams's batch option -2.
+     It is equivalent to SurfOpt's batch option *- - Hausdorff_like yes - - enrich no*.
 
    - **Geometrical Mesh : Coarsening and Enrichment** 
 
-     Yams coarses and enrichs meshes to obtain a purely geometrical mesh. The method is the same as above.
+     SurfOpt coarses and enrichs meshes to obtain a purely geometrical mesh. The method is the same as above.
 
-     It is equivalent to Yams's batch option 2.
+     It is equivalent to SurfOpt's batch option *- - Hausdorff_like yes*.
 
    - **Mesh for finite element computation : Coarsening** 
 
      The given surface triangulation is modified in accordance to a size map. The latter is the intrinsic size map (computed automatically and based on the surface properties, i.e. the local curvatures). One should use this option to coarsen  the mesh, when a regular mesh  for computation purposes is desired, i.e. a mesh with good aspect ratios or good quality elements.
 
-     It is equivalent to Yams's batch option -1.
+     It is equivalent to SurfOpt's batch option *- - enrich no*.
 
    - **Mesh for finite element computation : Coarsening and Enrichment**
 
      One should use this option to coarsen  and enrich the mesh, when a regular mesh for computation purposes is desired, i.e. a mesh with good aspect ratios or good quality elements. The method is the same as above.
 
-     It is equivalent to Yams's batch option 1.
+     It is equivalent to the default SurfOpt's behaviour (no option) .
    
 
 Units parameter
@@ -92,7 +95,10 @@ This field enables the user to bound the maximal chordal deviation allowed, that
 This parameter enables the user to specify the maximal chordal deviation epsilon max.
 
 it can be :
-  - relative : the maximal chordal deviation - epsilon max -is set to 0.001 x the parameter. by default, the parameter is set to 0.1 and the maximum deviation is also 0.1 x 1/1000 * the size of the bounding box,  which is equivalent to say that, for a bouding box of 1 meter, the maximal deviation is 0.1 mm.
+  - relative : the maximal chordal deviation - epsilon max - is set to *s x the parameter* where *s* is the size 
+    of the bounding box longest diagonal. 
+    By default, the parameter is set to 0.001 and the maximum deviation is then set to 0.001 x s,  
+    which is equivalent to say that, for a bouding box of 1 meter, the maximal deviation is 1 mm.
   - absolute : the maximal chordal deviation is the parameter itself. eg if the parameter equals 2, the maximal chordal deviation will be 2 (mm if the point coordonates are given in mm).
 
 Following that criterion:

diff --git a/src/Tools/YamsPlug/doc/editHypo.rst b/src/Tools/YamsPlug/doc/editHypo.rst
index 5a53da35517d8a80b947e13c64048df43e430c3f..3770d70c26048f6a1e658d899b90cac23b1b6c3b 100644 (file)
--- a/src/Tools/YamsPlug/doc/editHypo.rst
+++ b/src/Tools/YamsPlug/doc/editHypo.rst
@@ -4,11 +4,11 @@
 How to save MeshGems-SurfOpt Parameters 
 ===========================
 
-MeshGems-SurfOpt hypothesis is not meshing hypothesis for Salome, but hypothesis for yams.
+MeshGems-SurfOpt hypothesis is not a meshing hypothesis for Salome, but an hypothesis for MeshGems-SurfOpt.
 The current set of parameters is automatically written in the salome study object browser when you run computation.
 
 Theses parameters could also be stored in a special file.
-Default file is $HOME/.yams.dat.
+Default file is $HOME/.MGSurfOpt.dat.
 This ASCII file is appended, and never cleaned.
 
 In frame "Plug-in Generic Options":
@@ -23,15 +23,15 @@ At the bottom of the dialog window:
 - To load the default setting, click on "Default" pushbutton. .
 
 
-**example of .yams.dat**
+**example of .MGSurfOpt.dat**
 
 
 .. code-block:: python
 
-   # YAMS hypothesis parameters
+   # MGSurfOpt hypothesis parameters
    # Params for mesh : Mesh_1
    # Date : 23/05/13 14:23:18
-   # Command : yams -v 3 -O 0 -Drelative,tolerance=0.100000,maxsize=0.010000,minsize=0.000000 /tmp/ForYams_1.mesh
+   # Command : mg-surfopt.exe --verbose 3 --chordal_error 0.1 --max_size 0.01 --minsize 0.0 --in /tmp/ForSurfOpt_1.mesh
    Optimisation=Quality improvement Only (0)
    Units=Relative
    ChordalToleranceDeviation=0.1

diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py
index 5ea623eb52a7fc7998ec0f121de7a5d1dbe391a0..66b7ff13f3fed6ea5dd015d4c93043319f120595 100644 (file)
--- a/src/Tools/YamsPlug/monYamsPlugDialog.py
+++ b/src/Tools/YamsPlug/monYamsPlugDialog.py
@@ -420,7 +420,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     self.fichierIn=""
 
   def prepareFichier(self):
-    self.fichierIn="/tmp/ForYams_"+str(self.num)+".meshb"
+    self.fichierIn="/tmp/ForSurfOpt_"+str(self.num)+".meshb"
     self.__selectedMesh.ExportGMF(self.__selectedMesh, self.fichierIn, True)
 
   def PrepareLigneCommande(self):
@@ -457,9 +457,11 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
       self.commande+= " --uniform_flat_subdivision yes"
     elif style == "S" :
       self.commande+= " --sand_paper yes"
+    elif style == "G" :
+      self.commande+= " -O G"  # This option has not been updated to the new option style yet
 
     deb=os.path.splitext(self.fichierIn)
-    self.fichierOut=deb[0] + "_surfopt.meshb"
+    self.fichierOut=deb[0] + "_output.meshb"
     
     tolerance=self.SP_toStr(self.SP_Tolerance)
     if not self.RB_Absolute.isChecked():
@@ -469,7 +471,7 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     if self.CB_Ridge.isChecked()    == False : self.commande+=" --compute_ridges no"
     if self.CB_Point.isChecked()    == False : self.commande+=" --optimisation no"
     if self.CB_SplitEdge.isChecked()== True  : self.commande+=" --element_order quadratic"
-    if self.SP_Geomapp.value()      != 0.04  : self.commande+=" --geometric_approximation_angle %f"%self.SP_Geomapp.value()
+    if self.SP_Geomapp.value()      != 15.0  : self.commande+=" --geometric_approximation_angle %f"%self.SP_Geomapp.value()
     if self.SP_Ridge.value()        != 45.0  : self.commande+=" --ridge_angle %f"%self.SP_Ridge.value()
     if self.SP_MaxSize.value()      != 100   : self.commande+=" --max_size %f"   %self.SP_MaxSize.value()
     if self.SP_MinSize.value()      != 5     : self.commande+=" --min_size %f"   %self.SP_MinSize.value()
@@ -494,8 +496,8 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
     self.RB_Relative.setChecked(True)
     #no need: exlusives QRadioButton
     #self.RB_Absolute.setChecked(False)
-    self.SP_Tolerance.setProperty("text", "10.")
-    self.SP_Geomapp.setProperty("value", 0.04)
+    self.SP_Tolerance.setProperty("text", "0.001")
+    self.SP_Geomapp.setProperty("value", 15.0)
     self.SP_Ridge.setProperty("value", 45.0)
     self.SP_Gradation.setProperty("value", 1.3)
     self.CB_Ridge.setChecked(True)