Common update

diff --git a/doc/salome/gui/GEOM/chamfer.htm b/doc/salome/gui/GEOM/chamfer.htm
index 573ad682f2b241aabfb0aa1e6ca83b70f36259a1..735228f208d9e756470fc5ea03d8bbbcfed01b2d 100755 (executable)
--- a/doc/salome/gui/GEOM/chamfer.htm
+++ b/doc/salome/gui/GEOM/chamfer.htm
@@ -17,12 +17,15 @@ if (navigator.appName !="Netscape")
 img_whs1 { width:20px; height:20px; border-style:none; }\r
 p.whs2 { font-size:12pt; }\r
 p.whs3 { font-size:12pt; margin-left:40px; }\r
-img_whs4 { border:none; width:312px; height:319px; float:none; border-style:none; }\r
+img_whs4 { border:none; width:400px; height:319px; float:none; border-style:none; }\r
 img_whs5 { border:none; width:225px; height:239px; float:none; border-style:none; }\r
-img_whs6 { border:none; width:312px; height:381px; float:none; border-style:none; }\r
+img_whs6 { border:none; width:400px; height:426px; float:none; border-style:none; }\r
 img_whs7 { border:none; width:230px; height:245px; float:none; border-style:none; }\r
 img_whs8 { border:none; width:221px; height:238px; float:none; border-style:none; }\r
 p.whs9 { list-style:disc; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; }\r
+p.whs10 { list-style:disc; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; font-size:12pt; }\r
+p.whs11 { list-style:disc; margin-right:0in; margin-top:0px; margin-bottom:0px; font-size:12pt; margin-left:40px; }\r
+img_whs12 { border:none; width:400px; height:426px; float:none; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript">\r
 <!--\r
@@ -30,6 +33,8 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
 {\r
   var strNSS = "<style type='text/css'>";\r
   strNSS += "p.whs9 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";\r
+  strNSS += "p.whs10 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";\r
+  strNSS += "p.whs11 {margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";\r
   strNSS +="</style>";\r
   document.write(strNSS);\r
 }\r
@@ -119,35 +124,67 @@ if (window.writeIntopicBar)
  chamfer. &nbsp;</p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
- </i><span style="font-style: italic;"><I>geompy.MakeChamferAll(Shape, D)</I></span> \r
- </p>\r
+ </i><span style="font-style: italic;"><I>geompy.MakeChamferAll(Shape, \r
+ D)</I></span> </p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">Arguments: </b>Name \r
  + 1 SHAPE + 1 value (Chamfer dimension).</p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/chamfer1.png" x-maintain-ratio="TRUE" width="312px" height="319px" border="0" class="img_whs4"> &nbsp;<img src="pics/chamfer_all.png" x-maintain-ratio="TRUE" width="225px" height="239px" border="0" class="img_whs5"></p>\r
+<p class="whs3"><img src="pics/chamfer1.png" x-maintain-ratio="TRUE" width="400px" height="319px" border="0" class="img_whs4"> &nbsp;<img src="pics/chamfer_all.png" x-maintain-ratio="TRUE" width="225px" height="239px" border="0" class="img_whs5"></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs2">To create chamfer on the specified edges of \r
- the given shape, &nbsp;you \r
+<p class="whs2">In the algorithms below there exist two ways \r
+ to define the <span style="font-weight: bold;"><B>Dimension</B></span> of the \r
+ Chamfer.</p>\r
+\r
+<p class="whs2">Firstly the <span style="font-weight: bold;"><B>Dimension</B></span> \r
+ can be defined via <span style="font-weight: bold;"><B>D1</B></span> \r
+ and <span style="font-weight: bold;"><B>D2</B></span>, \r
+ which represent the offset on the first and the second face forming the \r
+ edge. </p>\r
+\r
+<p class="whs2">Secondly the <span style="font-weight: bold;"><B>Dimension</B></span> \r
+ can be defined via <span style="font-weight: bold;"><B>D,</B></span> which represents \r
+ the offset on the first face, and the <span style="font-weight: bold;"><B>Angle,</B></span> \r
+ which is the angle between the first face and the chamfer plane. </p>\r
+\r
+<p class="whs2">&nbsp;</p>\r
+\r
+<p class="whs2">To create chamfer on the edges lying between \r
+ the specified faces of the given shape, &nbsp;you \r
  need to define the <span style="font-weight: bold;"><B>Main Object</B></span> \r
- to create a fillet on, select the two faces to which belongs the <span \r
- style="font-size: 12pt;"><font size=3 style="font-size:12pt;">necessary common edge in the viewer and define \r
- the </font></span><span style="font-size: 12pt; font-weight: bold;"><font size=3 style="font-size:12pt;"><B>Dimension</B></font></span><span \r
- style="font-size: 12pt;"><font size=3 style="font-size:12pt;"> of the Chamfer.</font></span></p>\r
+ to create a fillet on, select the two (or more) faces to which belongs \r
+ the necessary common edge(s) \r
+ in the viewer and define the <span style="font-weight: bold;"><B>Dimension</B></span> \r
+ of the Chamfer.</p>\r
+\r
+<p class="whs2"><b>TUI Command:</b><i> </i><span style="font-style: italic;"><I>geompy.MakeChamferEdge(Shape, \r
+ D1, D2, \r
+ Face1, Face2)</I></span>, \r
+ where Shape is a shape to create a chamfer on, D1 \r
+ is a chamfer size along Face1, \r
+ D2 is a chamfer \r
+ size along Face2 \r
+ and Face1 and \r
+ Face2 are indices \r
+ of faces in Shape.</p>\r
 \r
-<p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
- </i><span style="font-style: italic;"><I>geompy.MakeChamferEdge(Shape, D1, \r
- D2, Face1, Face2)</I></span>, where Shape is a shape to create a chamfer on, \r
- D1 is a chamfer size along Face1, D2 is a chamfer size along Face2, Face1 \r
- and Face2 are indices of faces in Shape.</p>\r
+<p class="whs2">&nbsp;</p>\r
+\r
+<p class="whs2"><b>Alternative TUI Command:</b><i> </i><span \r
+ style="font-style: italic;"><I>geompy.MakeChamferEdge(Shape, \r
+ D, Angle, Face1, \r
+ Face2), where \r
+ </I></span>D is a chamfer size along Face1 \r
+ and Angle is the angle between Face1 \r
+ and the chamfer plane.</p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/chamfer2.png" x-maintain-ratio="TRUE" width="312px" height="381px" border="0" class="img_whs6"> &nbsp;<img src="pics/chamfer_edge.png" x-maintain-ratio="TRUE" width="230px" height="245px" border="0" class="img_whs7"></p>\r
+<p class="whs3"><img src="pics/chamfer2.png" x-maintain-ratio="TRUE" width="400px" height="426px" border="0" class="img_whs6"> &nbsp;<img src="pics/chamfer_edge.png" x-maintain-ratio="TRUE" width="230px" height="245px" border="0" class="img_whs7"></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
@@ -157,22 +194,67 @@ if (window.writeIntopicBar)
  to create a fillet on, select the necessary faces the OCC Viewer and define \r
  the <span style="font-weight: bold;"><B>Dimension</B></span> of the Chamfer.</p>\r
 \r
-<p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
- </i><span style="font-style: italic;"><I>geompy.MakeChamferFaces(Shape, D1, \r
- D2, ListOfFaceID)</I></span>, where Shape is a shape to create chamfer on, \r
- D1 is a chamfer size along a face from &nbsp;ListOfFaceID, \r
- &nbsp;D2 is a \r
- chamfer size along two faces connected to the edge to which the chamfer \r
- is applied, ListOfFaceID is a list of indices of faces in Shape.</p>\r
+<p class="whs2"><b>TUI Command:</b><i> </i><span style="font-style: italic;"><I>geompy.MakeChamferFaces(Shape, \r
+ D1, D2, \r
+ ListOfFaceID)</I></span>, \r
+ where Shape is a shape to create chamfer on, D1 \r
+ and D2 &nbsp;are \r
+ chamfer sizes along faces from &nbsp;ListOfFaceID. \r
+ For each Edge Face1 \r
+ and Face2 are \r
+ defined basing on their indices. </p>\r
+\r
+<p class="whs2">&nbsp;</p>\r
+\r
+<p class="whs2"><b>Alternative TUI Command:</b><i> </i><span \r
+ style="font-style: italic;"><I>geompy.MakeChamferFaces(Shape, \r
+ D, Angle, ListOfFaceID), \r
+ where </I></span>D is a chamfer size along Face1 \r
+ and Angle is the angle between Face1 \r
+ and the chamfer plane.</p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/chamfer3.png" x-maintain-ratio="TRUE" width="312px" height="381px" border="0" class="img_whs6"> &nbsp;<img src="pics/chamfer_faces.png" x-maintain-ratio="TRUE" width="221px" height="238px" border="0" class="img_whs8"></p>\r
+<p class="whs3"><img src="pics/chamfer3.png" x-maintain-ratio="TRUE" width="400px" height="426px" border="0" class="img_whs6"> &nbsp;<img src="pics/chamfer_faces.png" x-maintain-ratio="TRUE" width="221px" height="238px" border="0" class="img_whs8"></p>\r
 \r
 <p class="whs3">&nbsp;</p>\r
 \r
-<p class="whs9">&nbsp;&nbsp;<span \r
- style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Our </font></span><span \r
+<p class="whs9">To create chamfer on an arbitrary set \r
+ of edges of the given shape <span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">you need to \r
+ define the </font></span><span style="font-weight: bold;"><B>Main Object</B></span><span \r
+ style="font-size: 12pt;"><font size=3 style="font-size:12pt;"> to create a fillet on, select the necessary \r
+ edges in the OCC Viewer and define the </font></span><span style="font-weight: bold;"><B>Dimension</B></span><span \r
+ style="font-size: 12pt;"><font size=3 style="font-size:12pt;"> of the Chamfer.</font></span> &nbsp;&nbsp;</p>\r
+\r
+<p class="whs9"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b>TUI \r
+ Command:</b><i> </i></font></span><span style="font-style: italic;"><I>geompy.MakeChamferEdges(Shape, \r
+ D1, D2, \r
+ ListOfEdgeID)</I></span><span \r
+ style="font-size: 12pt;"><font size=3 style="font-size:12pt;">, where Shape is a shape to create a chamfer \r
+ on, D1 and \r
+ D2 are chamfer \r
+ sizes faces defined by the algorithm basing on ListOfEdgeID, \r
+ which is a list of &nbsp;indices \r
+ of edges in Shape. For each Edge the algorithm selects Face1 \r
+ and Face2 basing \r
+ on their indices. </font></span></p>\r
+\r
+<p class="whs9">&nbsp;</p>\r
+\r
+<p class="whs10"><b>Alternative TUI Command:</b><i> </i><span \r
+ style="font-style: italic;"><I>geompy.MakeChamferEdges(Shape, \r
+ D, Angle, ListOfEdgeID), \r
+ where </I></span>D is a chamfer size along Face1 \r
+ and Angle is the angle between Face1 \r
+ and the chamfer plane.</p>\r
+\r
+<p class="whs9">&nbsp;</p>\r
+\r
+<p class="whs11"><img src="pics/chamfer4.png" x-maintain-ratio="TRUE" width="400px" height="426px" border="0" class="img_whs12"></p>\r
+\r
+<p class="whs9">&nbsp;</p>\r
+\r
+<p class="whs9"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Our </font></span><span \r
  style="font-weight: bold;"><B>TUI Scripts</B></span><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"> \r
  provide you with useful examples of the use of <a href="transformation_operations.htm#bookmark4">Transformation \r
  Operations</a>. </font></span></p>\r

diff --git a/doc/salome/gui/GEOM/fillet.htm b/doc/salome/gui/GEOM/fillet.htm
index 611536ba5873baaca37509f944b5f77a508bd765..817448ff424a6a5fd396bfd056c2e4d5728bc91d 100755 (executable)
--- a/doc/salome/gui/GEOM/fillet.htm
+++ b/doc/salome/gui/GEOM/fillet.htm
@@ -18,7 +18,7 @@ img_whs1 { width:20px; height:20px; border-style:none; }
 p.whs2 { font-size:12pt; }\r
 p.whs3 { font-size:12pt; margin-left:40px; }\r
 img_whs4 { border:none; width:312px; height:315px; float:none; border-style:none; }\r
-img_whs5 { border:none; width:312px; height:346px; float:none; border-style:none; }\r
+img_whs5 { border:none; width:400px; height:376px; float:none; }\r
 p.whs6 { font-size:12pt; font-style:italic; margin-left:40px; }\r
 img_whs7 { border:none; width:226px; height:250px; float:none; border-style:none; }\r
 img_whs8 { border:none; float:none; width:208px; height:250px; border-style:none; }\r
@@ -118,7 +118,8 @@ if (window.writeIntopicBar)
  of the Fillet. &nbsp;</p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
- </i>geompy.MakeFilletAll(Shape, R) </p>\r
+ </i>geompy.MakeFilletAll(Shape, \r
+ R) </p>\r
 \r
 <p class="whs2"><span style="font-style: italic;"><I><b style="font-weight: bold;">A</I></span><span \r
  style="font-weight: bold;"><B>rguments: </B></span></b>Name + 1 shape + 1 value \r
@@ -138,7 +139,9 @@ if (window.writeIntopicBar)
  of the Fillet. </p>\r
 \r
 <p class="whs2"><span style="font-style: italic;"><I><b style="font-weight: bold; font-style: normal;">TUI \r
- Command:</b><i> </i>geompy.MakeFillet(Shape, R, ShapeType, ListShapes) \r
+ Command:</b><i> </i>geompy.MakeFillet(Shape, \r
+ R, ShapeType, \r
+ ListShapes) \r
  </I></span></p>\r
 \r
 <p class="whs2"><span style="font-style: italic;"><I><b style="font-weight: bold;">A</I></span><span \r
@@ -147,7 +150,16 @@ if (window.writeIntopicBar)
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/fillet2.png" x-maintain-ratio="TRUE" width="312px" height="346px" border="0" class="img_whs5"> &nbsp;<img src="pics/fillet3.png" x-maintain-ratio="TRUE" width="312px" height="346px" border="0" class="img_whs5"></p>\r
+<p class="whs2">Alternatively, there is a possibility to create \r
+ a fillet with a variable radius. For this, toggle the lower radio button \r
+ and define <span style="font-weight: bold;"><B>R1</B></span> \r
+ (the radius at the start of the selected edge(s)) \r
+ and <span style="font-weight: bold;"><B>R2</B></span> \r
+ (the radius at the end of the selected edge(s))</p>\r
+\r
+<p class="whs2">&nbsp;</p>\r
+\r
+<p class="whs3"><img src="pics/fillet2.png" x-maintain-ratio="TRUE" width="400px" height="376px" border="0" class="img_whs5"> &nbsp;<img src="pics/fillet3.png" x-maintain-ratio="TRUE" width="400px" height="376px" border="0" class="img_whs5"></p>\r
 \r
 <p class="whs2">&nbsp; </p>\r
 \r

diff --git a/doc/salome/gui/GEOM/viewing_geometrical_objects.htm b/doc/salome/gui/GEOM/viewing_geometrical_objects.htm
index 98ac4090b1033e1a1d70ea837f4dfa473f5be11a..39df73592c40419629465151dd66aeceb38a3c01 100755 (executable)
--- a/doc/salome/gui/GEOM/viewing_geometrical_objects.htm
+++ b/doc/salome/gui/GEOM/viewing_geometrical_objects.htm
@@ -14,12 +14,13 @@ if (navigator.appName !="Netscape")
 </script>\r
 <style type="text/css">\r
 <!--\r
-img_whs1 { border:none; width:340px; height:308px; border-style:none; }\r
-ul.whs2 { list-style:disc; }\r
-p.whs3 { font-weight:bold; }\r
-img_whs4 { border:none; width:26px; height:26px; border-style:none; }\r
-img_whs5 { border:none; width:23px; height:24px; border-style:none; }\r
-img_whs6 { border:none; width:279px; height:230px; border-style:none; }\r
+p.whs1 { margin-left:40px; }\r
+img_whs2 { border:none; width:187px; height:288px; float:none; border-style:none; }\r
+ul.whs3 { list-style:disc; }\r
+p.whs4 { font-weight:bold; }\r
+img_whs5 { border:none; width:26px; height:26px; border-style:none; }\r
+img_whs6 { border:none; width:23px; height:24px; border-style:none; }\r
+img_whs7 { border:none; width:279px; height:230px; border-style:none; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">\r
 <!--\r
@@ -80,6 +81,8 @@ if (window.writeIntopicBar)
        writeIntopicBar(4);\r
 //-->\r
 </script>\r
+<h1>&nbsp;</h1>\r
+\r
 <h1>Viewing Geometrical Objects</h1>\r
 \r
 <p>Newly created geometrical objects are automatically displayed in the \r
@@ -96,17 +99,20 @@ if (window.writeIntopicBar)
 \r
 <p>&nbsp;</p>\r
 \r
-<p><img src="image1.jpg" width="340px" height="308px" border="0" class="img_whs1"></p>\r
+<p class="whs1"><img src="pics/dialog.png" x-maintain-ratio="TRUE" width="187px" height="288px" border="0" class="img_whs2"></p>\r
 \r
 <p>&nbsp;</p>\r
 \r
-<ul type="disc" class="whs2">\r
+<ul type="disc" class="whs3">\r
        \r
        <li class=kadov-p><p><span style="font-weight: bold;"><B>Rename - </B></span>allows \r
  to change the name of the geometrical object.<span style="font-weight: bold;"> \r
  <B></B></span></p></li>\r
        \r
-       <li class=kadov-p><p class="whs3"><a href="wireframe_and_shading.htm">Display \r
+       <li class=kadov-p><p><span style="font-weight: bold;"><B>Delete - </B></span>irreversibly \r
+ deletes the selected object from the viewer and from the Object Browser</p></li>\r
+       \r
+       <li class=kadov-p><p class="whs4"><a href="wireframe_and_shading.htm">Display \r
  Mode</a> - <span style="font-weight: normal;">allows to select between \r
  Wireframe and Shading presentation.</span></p></li>\r
        \r
@@ -122,15 +128,15 @@ if (window.writeIntopicBar)
  - allows to <span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">change the number of isolines \r
  displayed within a shape.</font></span></p></li>\r
        \r
-       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image18.gif" width="26px" height="26px" border="0" class="img_whs4"> Erase</B></span> - allows to hide the selected geometrical object \r
+       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image18.gif" width="26px" height="26px" border="0" class="img_whs5"> Hide</B></span> - allows to hide the selected geometrical object \r
  from the viewer. <b><span style="font-size: 12pt; font-weight: normal;"><font size=3 style="font-size:12pt;">TUI \r
  Command</font></span><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"> :</b><i> sg.EraseOnly(ID)</i></font></span></p></li>\r
        \r
-       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image26.gif" width="26px" height="26px" border="0" class="img_whs4"> Erase all</B></span> &nbsp;- \r
+       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image26.gif" width="26px" height="26px" border="0" class="img_whs5"> Hide all</B></span> &nbsp;- \r
  allows to hide all objects from the viewer. <span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b \r
  style="font-weight: normal;">TUI Command:</b><i> sg.EraseAll()</i></font></span></p></li>\r
        \r
-       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image33.gif" width="23px" height="24px" border="0" class="img_whs5"> Display Only</B></span> -allows to display only the selected \r
+       <li class=kadov-p><p><span style="font-weight: bold;"><B><img src="image33.gif" width="23px" height="24px" border="0" class="img_whs6"> Display Only</B></span> -allows to display only the selected \r
  geometrical object, hiding all other from the viewer. <span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b \r
  style="font-weight: normal;">TUI Command:</b><i> sg.DisplayOnly(ID)</i></font></span></p></li>\r
        \r
@@ -154,11 +160,11 @@ if (window.writeIntopicBar)
 \r
 <p>&nbsp;</p>\r
 \r
-<p><img src="image2.jpg" width="279px" height="230px" border="0" class="img_whs6"></p>\r
+<p class="whs1"><img src="image2.jpg" width="279px" height="230px" border="0" class="img_whs7"></p>\r
 \r
 <p>&nbsp;</p>\r
 \r
-<ul type="disc" class="whs2">\r
+<ul type="disc" class="whs3">\r
        \r
        <li class=kadov-p><p><span style="font-weight: bold;"><B>Select Only</B></span> \r
  provides a filter for exclusive selection of objects of a certain type. \r