Update for 13330 and 13312 IMP

diff --git a/doc/salome/gui/SMESH/files/constructing_meshes.htm b/doc/salome/gui/SMESH/files/constructing_meshes.htm
index aaddaa6e9a2caf8daa46629b5b35fff0ceeaf662..ea2cf4bac989b19db90561db0e2e81f36cfc0cc9 100755 (executable)
--- a/doc/salome/gui/SMESH/files/constructing_meshes.htm
+++ b/doc/salome/gui/SMESH/files/constructing_meshes.htm
@@ -19,13 +19,16 @@ ul.whs2 { list-style:disc; }
 p.whs3 { margin-left:40px; }\r
 img_whs4 { border:none; width:22px; height:24px; border-style:none; }\r
 p.whs5 { margin-left:80px; }\r
-img_whs6 { border:none; width:370px; height:296px; float:none; }\r
+img_whs6 { border:none; width:370px; height:296px; float:none; border-style:none; }\r
 img_whs7 { border:none; width:173px; height:88px; border-style:none; }\r
 img_whs8 { border:none; width:34px; height:29px; border-style:none; }\r
 img_whs9 { border:none; width:29px; height:28px; border-style:none; }\r
 img_whs10 { border:none; width:30px; height:29px; border-style:none; }\r
 img_whs11 { border:none; width:232px; height:142px; border-style:none; float:right; }\r
 img_whs12 { border:none; width:25px; height:24px; border-style:none; }\r
+img_whs13 { border:none; width:457px; height:486px; float:none; border-style:none; }\r
+img_whs14 { border:none; width:564px; height:402px; float:none; border-style:none; }\r
+img_whs15 { border:none; width:260px; height:270px; float:none; border-style:none; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript">\r
 <!--\r
@@ -187,7 +190,37 @@ if (window.writeIntopicBar)
  your mesh in the <span style="font-weight: bold;"><B>Object Browser</B></span>. \r
  &nbsp;From the \r
  <span style="font-weight: bold;"><B>Mesh </B></span>menu select<span style="font-weight: bold;"><B> \r
- Compute </B></span>or click <img src="../image28.gif" width="25px" height="24px" border="0" class="img_whs12"> button of the toolbar. </p>\r
+ Compute </B></span>or click <img src="../image28.gif" width="25px" height="24px" border="0" class="img_whs12"> button of the toolbar. The Mesh \r
+ Computation information box appears.</p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3"><img src="../pics/meshcomputationsucceed.png" x-maintain-ratio="TRUE" width="457px" height="486px" border="0" class="img_whs13"></p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3">If the mesh computation failed, the information \r
+ about the cause of the failure is provided. </p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3"><img src="../pics/meshcomputationfail.png" x-maintain-ratio="TRUE" width="564px" height="402px" border="0" class="img_whs14"> </p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3">After you select the error, <span style="font-weight: bold;"><B>Show \r
+ Subshape</B></span> button allows visualizing the mesh elements that cause \r
+ it</p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3"><img src="../pics/failed_computation.png" x-maintain-ratio="TRUE" width="260px" height="270px" border="0" class="img_whs15"> </p>\r
+\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3"><span style="font-weight: bold;"><B>Publish \r
+ Subshape</B></span> button allows importing it in a separate MED or UNV file. \r
+ </p>\r
 \r
 <p class="whs3">&nbsp;</p>\r
 \r

diff --git a/doc/salome/gui/SMESH/files/merging_nodes.htm b/doc/salome/gui/SMESH/files/merging_nodes.htm
index dcd8493a7bf29f1ee65b73e8f32b0a90f4eab8f9..80e7bb5491f285c1add3f0868c5a4e4756c58f00 100755 (executable)
--- a/doc/salome/gui/SMESH/files/merging_nodes.htm
+++ b/doc/salome/gui/SMESH/files/merging_nodes.htm
@@ -16,9 +16,15 @@ if (navigator.appName !="Netscape")
 <!--\r
 img_whs1 { border:none; width:30px; height:30px; float:none; border-style:none; }\r
 p.whs2 { margin-left:40px; }\r
-img_whs3 { border:none; width:400px; height:488px; float:none; }\r
-img_whs4 { border:none; width:341px; height:375px; float:none; border-style:none; }\r
-img_whs5 { border:none; float:none; width:347px; height:376px; border-style:none; }\r
+img_whs3 { border:none; width:420px; height:507px; float:none; border-style:none; }\r
+ul.whs4 { list-style:disc; }\r
+p.whs5 { margin-left:72px; }\r
+p.whs6 { margin-left:40px; font-weight:bold; }\r
+img_whs7 { border:none; width:37px; height:28px; float:none; border-style:none; }\r
+img_whs8 { border:none; width:38px; height:30px; float:none; border-style:none; }\r
+img_whs9 { border:none; width:82px; height:27px; float:none; border-style:none; }\r
+img_whs10 { border:none; width:341px; height:375px; float:none; border-style:none; }\r
+img_whs11 { border:none; float:none; width:347px; height:376px; border-style:none; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">\r
 <!--\r
@@ -98,18 +104,58 @@ if (window.writeIntopicBar)
 \r
 <p>&nbsp;</p>\r
 \r
-<p class="whs2"><img src="../pics/mergenodes.png" x-maintain-ratio="TRUE" width="400px" height="488px" border="0" class="img_whs3"></p>\r
+<p class="whs2"><img src="../pics/mergenodes.png" x-maintain-ratio="TRUE" width="420px" height="507px" border="0" class="img_whs3"></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs2">This dialog box allows to create groups of \r
- coincident nodes and to merge them. </p>\r
+<ul type="disc" class="whs4">\r
+       \r
+       <li class=kadov-p><p class="whs2"><span style="font-weight: bold;"><B>Name</B></span> \r
+ is the name of the mesh whose nodes will be merged.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs2"><span style="font-weight: bold;"><B>Tolerance</B></span> \r
+ is a maximum distance between nodes sufficient for merging.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><span style="font-weight: bold;"><B>Detect</B></span> \r
+ button generates the list of coincident nodes for the given <span style="font-weight: bold;"><B>Tolerance</B></span>.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs2"><span style="font-weight: bold;"><B>Coincident \r
+ nodes</B></span> is a list of groupes of nodes for merging. All nodes of each \r
+ group will form one after the operation. </p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><span style="font-weight: bold;"><B>Remove</B></span> \r
+ button deletes the selected group from the list.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><span style="font-weight: bold;"><B>Add</B></span> \r
+ button adds to the list a group of nodes selected in the viewer with pressed \r
+ &quot;Shift&quot; key.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><span style="font-weight: bold;"><B>Select \r
+ all</B></span> checkbox selects all groups.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs6">Edit \r
+ selected group<span style="font-weight: normal;"> list</span> <span style="font-weight: normal;">allows \r
+ editing the selected group:</span></p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><img src="../pics/add.gif" x-maintain-ratio="TRUE" width="37px" height="28px" border="0" class="img_whs7"> adds \r
+ to the group the node selected in the viewer.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><img src="../pics/remove.gif" x-maintain-ratio="TRUE" width="38px" height="30px" border="0" class="img_whs8"> removes \r
+ from the group the selected node.</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs5"><img src="../pics/sort.gif" x-maintain-ratio="TRUE" width="82px" height="27px" border="0" class="img_whs9"> moves \r
+ the selected node to the first position in the group. This means that \r
+ all other nodes will be merged into this one. </p></li>\r
+</ul>\r
+\r
+<p class="whs5">&nbsp;</p>\r
+\r
+<p class="whs5">To confirm your choice click <span style="font-weight: bold;"><B>OK</B></span> \r
+ or <span style="font-weight: bold;"><B>Apply</B></span> button.</p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs2"><img src="../pics/merging_nodes1.png" x-maintain-ratio="TRUE" width="341px" height="375px" border="0" class="img_whs4"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="../pics/merging_nodes2.png" x-maintain-ratio="TRUE" width="347px" height="376px" border="0" class="img_whs5"></p>\r
-\r
-<p class="whs2">&nbsp;</p>\r
+<p class="whs2"><img src="../pics/merging_nodes1.png" x-maintain-ratio="TRUE" width="341px" height="375px" border="0" class="img_whs10"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="../pics/merging_nodes2.png" x-maintain-ratio="TRUE" width="347px" height="376px" border="0" class="img_whs11"></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r

diff --git a/doc/salome/gui/SMESH/pics/add.gif b/doc/salome/gui/SMESH/pics/add.gif
new file mode 100644 (file)
index 0000000..26350e4
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/add.gif differ

diff --git a/doc/salome/gui/SMESH/pics/failed_computation.png b/doc/salome/gui/SMESH/pics/failed_computation.png
new file mode 100644 (file)
index 0000000..e44a538
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/failed_computation.png differ

diff --git a/doc/salome/gui/SMESH/pics/mergenodes.png b/doc/salome/gui/SMESH/pics/mergenodes.png
index 36818438d940faf534ad4823b78b6e8b06390d7b..d7437e4002736897ecda44cf6849101b00258f5e 100755 (executable)
Binary files a/doc/salome/gui/SMESH/pics/mergenodes.png and b/doc/salome/gui/SMESH/pics/mergenodes.png differ

diff --git a/doc/salome/gui/SMESH/pics/meshcomputationfail.png b/doc/salome/gui/SMESH/pics/meshcomputationfail.png
new file mode 100644 (file)
index 0000000..9c26158
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/meshcomputationfail.png differ

diff --git a/doc/salome/gui/SMESH/pics/meshcomputationsucceed.png b/doc/salome/gui/SMESH/pics/meshcomputationsucceed.png
new file mode 100644 (file)
index 0000000..ab23579
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/meshcomputationsucceed.png differ

diff --git a/doc/salome/gui/SMESH/pics/remove.gif b/doc/salome/gui/SMESH/pics/remove.gif
new file mode 100644 (file)
index 0000000..8b81cb2
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/remove.gif differ

diff --git a/doc/salome/gui/SMESH/pics/sort.gif b/doc/salome/gui/SMESH/pics/sort.gif
new file mode 100644 (file)
index 0000000..28a5dff
Binary files /dev/null and b/doc/salome/gui/SMESH/pics/sort.gif differ