Update for 13191 IMP

diff --git a/doc/salome/gui/GEOM/glue_faces.htm b/doc/salome/gui/GEOM/glue_faces.htm
index 3f4d92b43d77da80cee579f3d8636c6eca3830b6..797d2ae95762a7b4c7f5e590ecf04e1ff39b3642 100755 (executable)
--- a/doc/salome/gui/GEOM/glue_faces.htm
+++ b/doc/salome/gui/GEOM/glue_faces.htm
@@ -17,15 +17,32 @@ if (navigator.appName !="Netscape")
 img_whs1 { border:none; width:25px; height:24px; border-style:none; }\r
 p.whs2 { font-size:12pt; }\r
 p.whs3 { font-size:12pt; text-indent:-68px; margin-left:72px; font-weight:normal; }\r
-p.whs4 { font-size:12pt; text-indent:-68px; margin-left:72px; }\r
-p.whs5 { font-size:12pt; text-indent:-68px; margin-left:112px; }\r
-img_whs6 { border:none; width:312px; height:315px; float:none; border-style:none; }\r
-p.whs7 { font-size:12pt; margin-left:112px; text-indent:-112px; }\r
-p.whs8 { font-size:12pt; text-indent:-112px; margin-left:152px; }\r
-img_whs9 { border:none; float:none; width:292px; height:239px; border-style:none; }\r
-img_whs10 { border:none; float:none; width:275px; height:239px; border-style:none; }\r
-p.whs11 { font-size:12pt; text-indent:-40px; margin-left:80px; }\r
-p.whs12 { font-weight:bold; }\r
+p.whs4 { font-size:12pt; margin-left:72px; text-indent:-72px; }\r
+p.whs5 { font-size:12pt; text-indent:-68px; margin-left:72px; }\r
+p.whs6 { font-size:12pt; margin-left:0px; }\r
+p.whs7 { font-size:12pt; text-indent:-68px; margin-left:112px; }\r
+img_whs8 { border:none; width:400px; height:315px; float:none; }\r
+p.whs9 { font-size:12pt; margin-left:112px; text-indent:-112px; }\r
+p.whs10 { font-size:12pt; text-indent:-112px; margin-left:152px; }\r
+img_whs11 { border:none; width:400px; height:370px; float:none; }\r
+img_whs12 { border:none; width:543px; height:123px; float:none; }\r
+table.whs13 { x-cell-content-align:top; border-spacing:0; width:94.919%; }\r
+col.whs14 { width:32.79%; }\r
+col.whs15 { width:31.064%; }\r
+col.whs16 { width:32.727%; }\r
+tr.whs17 { height:21px; }\r
+td.whs18 { padding-right:10px; padding-left:10px; border-left-style:none; border-top-style:none; border-bottom-style:none; border-right-style:none; }\r
+p.whs19 { font-style:italic; }\r
+td.whs20 { padding-right:10px; padding-left:10px; border-top-style:none; border-bottom-style:none; border-right-style:none; }\r
+td.whs21 { padding-right:10px; padding-left:10px; border-top-style:none; border-right-style:none; border-bottom-style:none; }\r
+tr.whs22 { height:23px; }\r
+td.whs23 { padding-right:10px; padding-left:10px; border-left-style:none; border-right-style:none; border-bottom-style:none; }\r
+img_whs24 { border:none; float:none; border-style:none; width:319px; height:261px; }\r
+td.whs25 { padding-right:10px; padding-left:10px; border-right-style:none; border-bottom-style:none; }\r
+img_whs26 { border:none; float:none; border-style:none; width:301px; height:261px; }\r
+img_whs27 { border:none; width:301px; height:260px; float:none; }\r
+p.whs28 { font-size:12pt; text-indent:-40px; margin-left:80px; }\r
+p.whs29 { font-weight:bold; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript">\r
 <!--\r
@@ -35,9 +52,11 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
   strNSS += "p.whs3 {text-indent:1pt; }";\r
   strNSS += "p.whs4 {text-indent:1pt; }";\r
   strNSS += "p.whs5 {text-indent:1pt; }";\r
+  strNSS += "p.whs6 {margin-left:1pt; }";\r
   strNSS += "p.whs7 {text-indent:1pt; }";\r
-  strNSS += "p.whs8 {text-indent:1pt; }";\r
-  strNSS += "p.whs11 {text-indent:1pt; }";\r
+  strNSS += "p.whs9 {text-indent:1pt; }";\r
+  strNSS += "p.whs10 {text-indent:1pt; }";\r
+  strNSS += "p.whs28 {text-indent:1pt; }";\r
   strNSS +="</style>";\r
   document.write(strNSS);\r
 }\r
@@ -104,8 +123,10 @@ if (window.writeIntopicBar)
 </script>\r
 <h1><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><img src="image61.gif" width="25px" height="24px" border="0" class="img_whs1"> </font></span>Glue Faces</h1>\r
 \r
-<p class="whs2"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b style="font-weight: normal;">T</b>o \r
- Glue Faces in the Main Menu select Repair - &gt; Glue Faces.</font></span></p>\r
+<p class="whs2"><b style="font-weight: normal;">T</b>o <span \r
+ style="font-weight: bold;"><B>Glue Faces</B></span> in the Main Menu select <span \r
+ style="font-weight: bold;"><B>Repair</B></span> - &gt; <span style="font-weight: bold;"><B>Glue \r
+ Faces</B></span>.</p>\r
 \r
 <p class="whs3">&nbsp;</p>\r
 \r
@@ -113,7 +134,7 @@ if (window.writeIntopicBar)
  g</b>lues faces that are coincident with respect to the given tolerance \r
  value.</p>\r
 \r
-<p class="whs4">&nbsp;</p>\r
+<p class="whs5">&nbsp;</p>\r
 \r
 <p class="whs2"><b><span style="font-weight: normal;">T</span></b><b><span \r
  style="font-weight: normal;">he</span> Result <span style="font-weight: normal;">will \r
@@ -121,34 +142,78 @@ if (window.writeIntopicBar)
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs4"><b>TUI Command : </b><span style="font-style: italic;"><I>geompy.MakeGlueFaces(theShape, \r
- theTolerance)</I></span>, where theShape is a compound of shapes to be glued, \r
- theTolerance is a maximum distance between two faces, which can be considered \r
- as coincident.</p>\r
+<p class="whs6"><b>TUI Command : </b><span \r
+ style="font-style: italic;"><I>geompy.MakeGlueFaces(theShape, theTolerance)</I></span>, \r
+ where <span style="font-style: italic;"><I>theShape</I></span> is a compound \r
+ of shapes to be glued, <span style="font-style: italic;"><I>theTolerance</I></span> \r
+ is a maximum distance between two faces, which can be considered as coincident.</p>\r
 \r
 <p class="whs4"><b style="font-weight: bold;">Arguments: \r
  <span style="font-weight: normal;">Name +</span> </b>1 <i><span style="font-style: normal;">Compound \r
  + Tolerance value</span></i></p>\r
 \r
-<p class="whs4">&nbsp;</p>\r
+<p class="whs5">&nbsp;</p>\r
 \r
-<p class="whs4">&nbsp;</p>\r
+<p class="whs7"><img src="pics/glue1.png" x-maintain-ratio="TRUE" width="400px" height="315px" border="0" class="img_whs8"></p>\r
 \r
-<p class="whs5"><img src="pics/repair7.png" x-maintain-ratio="TRUE" width="312px" height="315px" border="0" class="img_whs6"></p>\r
+<p class="whs9">&nbsp;</p>\r
 \r
-<p class="whs7">&nbsp;</p>\r
+<p class="whs9">It is also possible to manually select \r
+ the faces that will be glued - select the shape, specify the tolerance \r
+ and press <span style="font-weight: bold;"><B>Detect</B></span> button. </p>\r
 \r
-<p class="whs7"><b style="font-weight: bold;">Example:</b></p>\r
+<p class="whs9">&nbsp;</p>\r
 \r
-<p class="whs7">&nbsp;</p>\r
+<p class="whs10"><img src="pics/glue2.png" x-maintain-ratio="TRUE" width="400px" height="370px" border="0" class="img_whs11"></p>\r
 \r
-<p class="whs8"><img src="pics/glue_faces1.png" x-maintain-ratio="TRUE" width="292px" height="239px" border="0" class="img_whs9"> &nbsp;&nbsp;<img src="pics/glue_faces2.png" x-maintain-ratio="TRUE" width="275px" height="239px" border="0" class="img_whs10"></p>\r
+<p class="whs9">&nbsp;</p>\r
 \r
-<p class="whs11">&nbsp;</p>\r
+<p class="whs9"><span style="font-weight: bold;"><B>Geometry</B></span> \r
+ module detects the faces where gluing can be performed and displays a \r
+ notification.</p>\r
 \r
-<p class="whs11">&nbsp;</p>\r
+<p class="whs9">&nbsp;</p>\r
 \r
-<p class="whs12"><span style="font-weight: normal;">Our</span> \r
+<p class="whs10"><img src="pics/glue3.png" x-maintain-ratio="TRUE" width="543px" height="123px" border="0" class="img_whs12"></p>\r
+\r
+<p class="whs9">&nbsp;</p>\r
+\r
+<p class="whs9">The faces that can be glued are colored \r
+ in red. &nbsp;It \r
+ is possible to select the faces for gluing in the 3D viewer. The selected \r
+ faces will be marked in white. </p>\r
+\r
+<p class="whs9">&nbsp;</p>\r
+\r
+<p class="whs9"><b style="font-weight: bold;">Example:</b></p>\r
+\r
+<table x-use-null-cells width="94.919%" cellspacing="0" class="whs13">\r
+<col class="whs14">\r
+<col class="whs15">\r
+<col class="whs16">\r
+\r
+<tr valign="top" class="whs17">\r
+<td width="32.79%" class="whs18">\r
+<p class="whs19">Object that needs gluing.</td>\r
+<td width="31.064%" class="whs20">\r
+<p class="whs19">Glued object.</td>\r
+<td width="32.727%" class="whs21">\r
+<p class="whs19">Manual selection of faces for gluing.</td></tr>\r
+\r
+<tr valign="top" class="whs22">\r
+<td width="32.79%" class="whs23">\r
+<p class="whs2"><img src="pics/glue_faces1.png" x-maintain-ratio="TRUE" width="319px" height="261px" border="0" class="img_whs24"></td>\r
+<td width="31.064%" class="whs25">\r
+<p class="whs2"><img src="pics/glue_faces2.png" x-maintain-ratio="TRUE" width="301px" height="261px" border="0" class="img_whs26"></td>\r
+<td width="32.727%" class="whs25">\r
+<p class="whs2"><img src="pics/glue_faces3.png" x-maintain-ratio="TRUE" width="301px" height="260px" border="0" class="img_whs27"></td></tr>\r
+</table>\r
+\r
+<p class="whs28">&nbsp;</p>\r
+\r
+<p class="whs28">&nbsp;</p>\r
+\r
+<p class="whs29"><span style="font-weight: normal;">Our</span> \r
  TUI Scripts <span style="font-weight: normal;">provide you with useful \r
  examples of the use of</span> <a href="repairing_operations.htm#bookmark6">Repairing \r
  Operations</a>. </p>\r

diff --git a/doc/salome/gui/GEOM/pics/glue1.png b/doc/salome/gui/GEOM/pics/glue1.png
new file mode 100644 (file)
index 0000000..54fa5bf
Binary files /dev/null and b/doc/salome/gui/GEOM/pics/glue1.png differ

diff --git a/doc/salome/gui/GEOM/pics/glue2.png b/doc/salome/gui/GEOM/pics/glue2.png
new file mode 100644 (file)
index 0000000..475e54f
Binary files /dev/null and b/doc/salome/gui/GEOM/pics/glue2.png differ

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

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