minor bugs

diff --git a/src/Tools/YamsPlug/YamsPlugDialog.ui b/src/Tools/YamsPlug/YamsPlugDialog.ui
index df7721e9fa9553972a495f57209e0745c996712d..0cc606e03abacf1ae519adb8984e75789dabbe98 100644 (file)
--- a/src/Tools/YamsPlug/YamsPlugDialog.ui
+++ b/src/Tools/YamsPlug/YamsPlugDialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>799</width>
-    <height>602</height>
+    <width>927</width>
+    <height>700</height>

    </rect>
   </property>
   <property name="windowTitle">
    </rect>
   </property>
   <property name="windowTitle">


@@ -115,9 +115,9 @@
        <property name="geometry">
         <rect>
          <x>20</x>
        <property name="geometry">
         <rect>
          <x>20</x>

-         <y>140</y>
-         <width>741</width>
-         <height>271</height>
+         <y>190</y>
+         <width>871</width>
+         <height>311</height>

         </rect>
        </property>
        <property name="title">
         </rect>
        </property>
        <property name="title">


@@ -126,17 +126,23 @@
        <widget class="QGroupBox" name="mesRB">
         <property name="geometry">
          <rect>
        <widget class="QGroupBox" name="mesRB">
         <property name="geometry">
          <rect>

-          <x>10</x>
+          <x>20</x>

           <y>30</y>
           <width>611</width>
           <y>30</y>
           <width>611</width>

-          <height>209</height>
+          <height>261</height>

          </rect>
         </property>
          </rect>
         </property>

-        <layout class="QVBoxLayout" name="monRBLayout">
-         <item>
-          <widget class="QRadioButton" name="RB_0">
-           <property name="toolTip">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <widget class="QRadioButton" name="RB_0">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>25</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;


@@ -144,201 +150,341 @@ p, li { white-space: pre-wrap; }
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quality improvement&lt;/span&gt; is done by point smoothing and edge swapping&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quality improvement&lt;/span&gt; is done by point smoothing and edge swapping&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</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 
+         </property>
+         <property name="text">
+          <string>Quality improvement Only (0)</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB_G">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>54</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <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>
 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>a uniform subdivision of the given surface triangulation is performed : 
+         </property>
+         <property name="text">
+          <string>Pure Geometry Enrichment (G)</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB_U">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>83</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>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.</string>
 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(U)</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB_S">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>112</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <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 goemetry.</string>
 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 goemetry.</string>

-           </property>
-           <property name="text">
-            <string>Smoothing (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>Sand Papering (S)</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB__2">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>141</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <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>
 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(-2)</string>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB_2">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>170</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <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>
 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 modfied in accordance to a size map. 
+         </property>
+         <property name="text">
+          <string>Geometrical Mesh : Coarsening and Enrichment (2)</string>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB__1">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>199</y>
+           <width>585</width>
+           <height>23</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>The given surface triangulation is modfied 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>
 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 modfied in accordance to a size map. 
+         </property>
+         <property name="text">
+          <string>Mesh for finite element computation : Coarsening (-1)</string>
+         </property>
+        </widget>
+        <widget class="QRadioButton" name="RB_1">
+         <property name="geometry">
+          <rect>
+           <x>17</x>
+           <y>228</y>
+           <width>585</width>
+           <height>22</height>
+          </rect>
+         </property>
+         <property name="toolTip">
+          <string>The given surface triangulation is modfied 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  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>
 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  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>
+         </property>
+         <property name="text">
+          <string>Mesh for finite element computation : Coarsening and Enrichment  (1)</string>
+         </property>
+        </widget>

        </widget>
       </widget>
        </widget>
       </widget>

-      <widget class="QGroupBox" name="GBUnit">
+      <widget class="QGroupBox" name="groupBox">

        <property name="geometry">
         <rect>
        <property name="geometry">
         <rect>

-         <x>20</x>
-         <y>420</y>
-         <width>301</width>
-         <height>71</height>
+         <x>10</x>
+         <y>20</y>
+         <width>871</width>
+         <height>161</height>

         </rect>
        </property>
         </rect>
        </property>

-       <property name="toolTip">
-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
-&lt;tr&gt;
-&lt;td style=&quot;border: none;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       <property name="font">
+        <font>
+         <pointsize>10</pointsize>
+        </font>

        </property>
        <property name="title">
        </property>
        <property name="title">

-        <string>Units</string>
+        <string>Original Mesh</string>

        </property>
        </property>

-       <widget class="QRadioButton" name="RB_Absolute">
+       <widget class="QWidget" name="">

         <property name="geometry">
          <rect>
           <x>10</x>
           <y>30</y>
         <property name="geometry">
          <rect>
           <x>10</x>
           <y>30</y>

-          <width>110</width>
-          <height>24</height>
-         </rect>
-        </property>
-        <property name="toolTip">
-         <string>Values are expressed in the model units.</string>
-        </property>
-        <property name="text">
-         <string>Absolute</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-       <widget class="QRadioButton" name="RB_Relative">
-        <property name="geometry">
-         <rect>
-          <x>160</x>
-          <y>30</y>
-          <width>110</width>
-          <height>24</height>
+          <width>861</width>
+          <height>101</height>

          </rect>
         </property>
          </rect>
         </property>

-        <property name="toolTip">
-         <string>Values are relative to the bounding box size.</string>
-        </property>
-        <property name="text">
-         <string>Relative</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <item row="0" column="1">
+          <widget class="QLabel" name="label_7">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+             <strikeout>false</strikeout>
+            </font>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::Box</enum>
+           </property>
+           <property name="text">
+            <string>Smesh mesh</string>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+           <property name="margin">
+            <number>0</number>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="2">
+          <widget class="QPushButton" name="PB_MeshSmesh">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset>
+             <normaloff>../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png</normaloff>../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>18</width>
+             <height>18</height>
+            </size>
+           </property>
+           <property name="checkable">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="3">
+          <widget class="QLineEdit" name="LE_MeshSmesh">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_8">
+           <property name="text">
+            <string>or</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" colspan="2">
+          <widget class="QPushButton" name="PB_MeshFile">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="text">
+            <string>Mesh File (GMF format)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="3">
+          <widget class="QLineEdit" name="LE_MeshFile">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+          </widget>
+         </item>
+        </layout>

        </widget>
       </widget>
        </widget>
       </widget>

-      <widget class="QGroupBox" name="GBTolerance_2">
+      <widget class="QDoubleSpinBox" name="SP_Tolerance">

        <property name="geometry">
         <rect>
        <property name="geometry">
         <rect>

-         <x>410</x>
-         <y>430</y>
-         <width>351</width>
-         <height>71</height>
+         <x>430</x>
+         <y>540</y>
+         <width>111</width>
+         <height>31</height>

         </rect>
        </property>
         </rect>
        </property>

+       <property name="font">
+        <font>
+         <stylestrategy>PreferDefault</stylestrategy>
+        </font>
+       </property>
+       <property name="mouseTracking">
+        <bool>true</bool>
+       </property>

        <property name="toolTip">
        <property name="toolTip">

-        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+        <string>If the Units parameter is relative epsilon max correspond to 0.0001x s x tolerance parameter where s is the size of the bounding box of the domain.
+If the Units parameter is absolute, the tolerance parameter is expressed in model units :
+if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm </string>
+       </property>
+       <property name="maximum">
+        <double>100000.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="value">
+        <double>0.100000000000000</double>
+       </property>
+      </widget>
+      <widget class="QWidget" name="">
+       <property name="geometry">
+        <rect>
+         <x>30</x>
+         <y>500</y>
+         <width>801</width>
+         <height>37</height>
+        </rect>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QGroupBox" name="GBUnit">
+          <property name="toolTip">
+           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
+&lt;tr&gt;
+&lt;td style=&quot;border: none;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+          </property>
+          <property name="title">
+           <string>Units</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QGroupBox" name="GBTolerance_2">
+          <property name="toolTip">
+           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;

 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;


@@ -354,180 +500,59 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>

-       </property>
-       <property name="title">
-        <string>Chordal deviation Tolerance</string>
-       </property>
-       <widget class="QDoubleSpinBox" name="SP_Tolerance">
-        <property name="geometry">
-         <rect>
-          <x>40</x>
-          <y>30</y>
-          <width>81</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="font">
-         <font>
-          <stylestrategy>PreferDefault</stylestrategy>
-         </font>
-        </property>
-        <property name="mouseTracking">
-         <bool>true</bool>
-        </property>
-        <property name="toolTip">
-         <string>If the Units parameter is relative epsilon max correspond to 0.0001x s x tolerance parameter where s is the size of the bounding box of the domain.
-If the Units parameter is absolute, the tolerance parameter is expressed in model units :
-if P=2 and point coordinaters are givin in millimetre, it menas that the maximal chordal deviation is 2 mm </string>
-        </property>
-        <property name="maximum">
-         <double>100000.000000000000000</double>
-        </property>
-        <property name="singleStep">
-         <double>1.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.100000000000000</double>
-        </property>
-       </widget>
+          </property>
+          <property name="title">
+           <string>Chordal deviation Tolerance</string>
+          </property>
+         </widget>
+        </item>
+       </layout>

       </widget>
       </widget>

-      <widget class="QGroupBox" name="groupBox">
+      <widget class="QWidget" name="">

        <property name="geometry">
         <rect>
        <property name="geometry">
         <rect>

-         <x>10</x>
-         <y>10</y>
-         <width>741</width>
-         <height>121</height>
+         <x>60</x>
+         <y>540</y>
+         <width>230</width>
+         <height>31</height>

         </rect>
        </property>
         </rect>
        </property>

-       <property name="font">
-        <font>
-         <pointsize>12</pointsize>
-        </font>
-       </property>
-       <property name="title">
-        <string>Original Mesh</string>
-       </property>
-       <widget class="QPushButton" name="PB_MeshFile">
-        <property name="geometry">
-         <rect>
-          <x>40</x>
-          <y>70</y>
-          <width>191</width>
-          <height>33</height>
-         </rect>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>10</pointsize>
-         </font>
-        </property>
-        <property name="text">
-         <string>Mesh File (GMF format)</string>
-        </property>
-       </widget>
-       <widget class="QLineEdit" name="LE_MeshFile">
-        <property name="geometry">
-         <rect>
-          <x>240</x>
-          <y>70</y>
-          <width>481</width>
-          <height>31</height>
-         </rect>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>10</pointsize>
-         </font>
-        </property>
-       </widget>
-       <widget class="QPushButton" name="PB_MeshSmesh">
-        <property name="geometry">
-         <rect>
-          <x>190</x>
-          <y>30</y>
-          <width>41</width>
-          <height>31</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset>
-          <normaloff>../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png</normaloff>../../../../../../../../SalomeSrc/SMESH_V6_main/src/Tools/YamsPlug/open.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>18</width>
-          <height>18</height>
-         </size>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-       </widget>
-       <widget class="QLineEdit" name="LE_MeshSmesh">
-        <property name="geometry">
-         <rect>
-          <x>240</x>
-          <y>30</y>
-          <width>481</width>
-          <height>31</height>
-         </rect>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>10</pointsize>
-         </font>
-        </property>
-       </widget>
-       <widget class="QLabel" name="label_7">
-        <property name="geometry">
-         <rect>
-          <x>40</x>
-          <y>30</y>
-          <width>141</width>
-          <height>31</height>
-         </rect>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>10</pointsize>
-          <strikeout>false</strikeout>
-         </font>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::Box</enum>
-        </property>
-        <property name="text">
-         <string>Smesh mesh</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-        <property name="margin">
-         <number>0</number>
-        </property>
-       </widget>
-       <widget class="QLabel" name="label_8">
-        <property name="geometry">
-         <rect>
-          <x>10</x>
-          <y>80</y>
-          <width>31</width>
-          <height>18</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string>or</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <item>
+         <widget class="QRadioButton" name="RB_Absolute">
+          <property name="toolTip">
+           <string>Values are expressed in the model units.</string>
+          </property>
+          <property name="text">
+           <string>Absolute</string>
+          </property>
+          <property name="checked">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RB_Relative">
+          <property name="toolTip">
+           <string>Values are relative to the bounding box size.</string>
+          </property>
+          <property name="text">
+           <string>Relative</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>

       </widget>
       <zorder>GBUnit</zorder>
       <zorder>GBTolerance_2</zorder>
       <zorder>groupBox</zorder>
       <zorder>GBOptim</zorder>
       </widget>
       <zorder>GBUnit</zorder>
       <zorder>GBTolerance_2</zorder>
       <zorder>groupBox</zorder>
       <zorder>GBOptim</zorder>

+      <zorder>SP_Tolerance</zorder>
+      <zorder>RB_Relative</zorder>
+      <zorder>RB_Absolute</zorder>

      </widget>
      <widget class="QWidget" name="advanced">
       <attribute name="title">
      </widget>
      <widget class="QWidget" name="advanced">
       <attribute name="title">


@@ -595,9 +620,9 @@ or add vertices (refines) to change the mesh.</string>
        <property name="geometry">
         <rect>
          <x>10</x>
        <property name="geometry">
         <rect>
          <x>10</x>

-         <y>100</y>
-         <width>761</width>
-         <height>321</height>
+         <y>90</y>
+         <width>841</width>
+         <height>391</height>

         </rect>
        </property>
        <property name="title">
         </rect>
        </property>
        <property name="title">


@@ -627,7 +652,7 @@ or add vertices (refines) to change the mesh.</string>
          <rect>
           <x>120</x>
           <y>20</y>
          <rect>
           <x>120</x>
           <y>20</y>

-          <width>631</width>
+          <width>731</width>

           <height>61</height>
          </rect>
         </property>
           <height>61</height>
          </rect>
         </property>


@@ -652,21 +677,21 @@ faces .</string>
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }

-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;

-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Geometrical approximation :  Maximum angle allowed between a face and a curve &lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;(not separated by a ridge).&lt;/span&gt;)&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;Geometrical approximation :  Maximum angle (1-cos(angle)) allowed &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;between a face and a curve &lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:8pt;&quot;&gt;(not separated by a ridge).&lt;/span&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>

         </property>
        </widget>
        <widget class="QLabel" name="label_4">
         <property name="geometry">
          <rect>
           <x>120</x>
         </property>
        </widget>
        <widget class="QLabel" name="label_4">
         <property name="geometry">
          <rect>
           <x>120</x>

-          <y>70</y>
-          <width>581</width>
+          <y>80</y>
+          <width>691</width>

           <height>71</height>
          </rect>
         </property>
           <height>71</height>
          </rect>
         </property>


@@ -674,21 +699,21 @@ p, li { white-space: pre-wrap; }
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }

-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;

 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;
 &lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
 &lt;tr&gt;
 &lt;td style=&quot;border: none;&quot;&gt;

-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ridge angle:&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;if the angle between the normal vectors of two adjacent faces exceeds&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;this value, the edge common to the faces is a ridge&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;Ridge angle:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;if the angle between the normal vectors of two adjacent faces&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif';&quot;&gt;exceeds this value, the edge common to the faces is a ridge&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>

         </property>
        </widget>
        <widget class="QDoubleSpinBox" name="SP_Ridge">
         <property name="geometry">
          <rect>
           <x>10</x>
         </property>
        </widget>
        <widget class="QDoubleSpinBox" name="SP_Ridge">
         <property name="geometry">
          <rect>
           <x>10</x>

-          <y>90</y>
+          <y>100</y>

           <width>91</width>
           <height>23</height>
          </rect>
           <width>91</width>
           <height>23</height>
          </rect>


@@ -704,9 +729,9 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>120</x>
         <property name="geometry">
          <rect>
           <x>120</x>

-          <y>140</y>
-          <width>521</width>
-          <height>41</height>
+          <y>160</y>
+          <width>681</width>
+          <height>61</height>

          </rect>
         </property>
         <property name="toolTip">
          </rect>
         </property>
         <property name="toolTip">


@@ -734,9 +759,9 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>120</x>
         <property name="geometry">
          <rect>
           <x>120</x>

-          <y>240</y>
-          <width>591</width>
-          <height>61</height>
+          <y>290</y>
+          <width>691</width>
+          <height>91</height>

          </rect>
         </property>
         <property name="toolTip">
          </rect>
         </property>
         <property name="toolTip">


@@ -765,7 +790,7 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>10</x>
         <property name="geometry">
          <rect>
           <x>10</x>

-          <y>250</y>
+          <y>300</y>

           <width>91</width>
           <height>23</height>
          </rect>
           <width>91</width>
           <height>23</height>
          </rect>


@@ -781,7 +806,7 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>10</x>
         <property name="geometry">
          <rect>
           <x>10</x>

-          <y>150</y>
+          <y>170</y>

           <width>91</width>
           <height>23</height>
          </rect>
           <width>91</width>
           <height>23</height>
          </rect>


@@ -803,9 +828,9 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>120</x>
         <property name="geometry">
          <rect>
           <x>120</x>

-          <y>190</y>
-          <width>521</width>
-          <height>41</height>
+          <y>230</y>
+          <width>661</width>
+          <height>51</height>

          </rect>
         </property>
         <property name="toolTip">
          </rect>
         </property>
         <property name="toolTip">


@@ -833,7 +858,7 @@ p, li { white-space: pre-wrap; }
         <property name="geometry">
          <rect>
           <x>10</x>
         <property name="geometry">
          <rect>
           <x>10</x>

-          <y>200</y>
+          <y>230</y>

           <width>91</width>
           <height>23</height>
          </rect>
           <width>91</width>
           <height>23</height>
          </rect>


@@ -855,36 +880,36 @@ p, li { white-space: pre-wrap; }
       <widget class="QGroupBox" name="groupBox_3">
        <property name="geometry">
         <rect>
       <widget class="QGroupBox" name="groupBox_3">
        <property name="geometry">
         <rect>

-         <x>10</x>
-         <y>440</y>
+         <x>20</x>
+         <y>490</y>

          <width>751</width>
          <width>751</width>

-         <height>61</height>
+         <height>31</height>

         </rect>
        </property>
        <property name="title">
         <string>You can enable :</string>
        </property>
         </rect>
        </property>
        <property name="title">
         <string>You can enable :</string>
        </property>

-       <widget class="QCheckBox" name="CB_SplitEdge">
-        <property name="geometry">
-         <rect>
-          <x>100</x>
-          <y>20</y>
-          <width>271</width>
-          <height>23</height>
-         </rect>
-        </property>
-        <property name="toolTip">
-         <string>if set, Yams creates new vertices placed on the curved surface and adds them to elements. 
+      </widget>
+      <widget class="QCheckBox" name="CB_SplitEdge">
+       <property name="geometry">
+        <rect>
+         <x>70</x>
+         <y>530</y>
+         <width>271</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="toolTip">
+        <string>if set, Yams creates new vertices placed on the curved surface and adds them to elements. 

 It means one extra vertex on edge (P2 or quadratic triangles).
 New created vertices  are saved in the .mesh file under keyword section Vertices</string>
 It means one extra vertex on edge (P2 or quadratic triangles).
 New created vertices  are saved in the .mesh file under keyword section Vertices</string>

-        </property>
-        <property name="text">
-         <string>split edge</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
+       </property>
+       <property name="text">
+        <string>split edge</string>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>

       </widget>
      </widget>
      <widget class="QWidget" name="generic">
       </widget>
      </widget>
      <widget class="QWidget" name="generic">


@@ -909,7 +934,7 @@ New created vertices  are saved in the .mesh file under keyword section Vertices
           <x>40</x>
           <y>30</y>
           <width>441</width>
           <x>40</x>
           <y>30</y>
           <width>441</width>

-          <height>27</height>
+          <height>34</height>

          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">


@@ -951,7 +976,7 @@ New created vertices  are saved in the .mesh file under keyword section Vertices
           <x>40</x>
           <y>70</y>
           <width>441</width>
           <x>40</x>
           <y>70</y>
           <width>441</width>

-          <height>27</height>
+          <height>34</height>

          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          </rect>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">

diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py
index 21ee634fb2a16a2e582047813868b51c2c94868b..07352668141c8b14360b8b2a32c6b523f461e4ac 100644 (file)
--- a/src/Tools/YamsPlug/monYamsPlugDialog.py
+++ b/src/Tools/YamsPlug/monYamsPlugDialog.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-# Copyright (C) 2007-2013  EDF R&D
+# Copyright (C) 2007-2013   EDF R&D

 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public


@@ -17,7 +17,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #

-

 # Modules Python
 # Modules Eficas
 
 # Modules Python
 # Modules Eficas
 


@@ -265,8 +264,8 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
       else :
          self.commande+=' -Drelative'
       self.commande+=',tolerance=%f'%self.SP_Tolerance.value()
       else :
          self.commande+=' -Drelative'
       self.commande+=',tolerance=%f'%self.SP_Tolerance.value()

-      if self.CB_Ridge.isChecked()==False : self.commande+=',nr'
-      if self.CB_Point.isChecked()==False : self.commande+=',ns'
+      if self.CB_Ridge.isChecked()==False : self.commande+=',-nr'
+      if self.CB_Point.isChecked()==False : self.commande+=',-ns'

       if self.SP_Geomapp.value()!=0.04 : self.commande+=',geomapp=%f'%self.SP_Geomapp.value()
       if self.SP_Ridge.value()!=45.0 : self.commande+=',ridge=%f'%self.SP_Ridge.value()
       if self.SP_MaxSize.value()!=100 : self.commande+=',maxsize=%f'%self.SP_MaxSize.value()
       if self.SP_Geomapp.value()!=0.04 : self.commande+=',geomapp=%f'%self.SP_Geomapp.value()
       if self.SP_Ridge.value()!=45.0 : self.commande+=',ridge=%f'%self.SP_Ridge.value()
       if self.SP_MaxSize.value()!=100 : self.commande+=',maxsize=%f'%self.SP_MaxSize.value()