Correct documentation style and pictures.

diff --git a/doc/salome/gui/GEOM/partition.htm b/doc/salome/gui/GEOM/partition.htm
index d0a3e0f252733ce813fc69b62d2e0176f57b70e0..041d8d625914346137adcd96c93d0386f3e2c106 100755 (executable)
--- a/doc/salome/gui/GEOM/partition.htm
+++ b/doc/salome/gui/GEOM/partition.htm
@@ -18,12 +18,11 @@ img_whs1 { width:20px; height:20px; border-style:none; }
 p.whs2 { font-size:12pt; }\r
 p.whs3 { font-size:12pt; font-weight:normal; }\r
 p.whs4 { font-weight:bold; font-size:14pt; }\r
-p.whs5 { font-size:12pt; font-weight:bold; }\r
-p.whs6 { font-size:12pt; margin-left:40px; }\r
-img_whs7 { border:none; width:312px; height:483px; float:none; border-style:none; }\r
-img_whs8 { border:none; width:448px; height:302px; float:none; border-style:none; }\r
-img_whs9 { border:none; float:none; width:297px; height:245px; border-style:none; }\r
-img_whs10 { border:none; float:none; width:273px; height:245px; border-style:none; }\r
+p.whs5 { font-size:12pt; margin-left:40px; }\r
+img_whs6 { border:none; width:400px; height:350px; float:none; border-style:none; }\r
+img_whs7 { border:none; width:400px; height:324px; float:none; border-style:none; }\r
+img_whs8 { border:none; float:none; width:297px; height:245px; border-style:none; }\r
+img_whs9 { border:none; float:none; width:273px; height:245px; border-style:none; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">\r
 <!--\r
@@ -105,27 +104,32 @@ if (window.writeIntopicBar)
 <p class="whs4"><b><span style="font-weight: bold;"><B>Intersection \r
  of two shapes.</B></span></b></p>\r
 \r
-<p class="whs5">&nbsp;</p>\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3">As far as the intersection \r
+ of two objects can produce any type of geometrical objects, <span style="font-weight: bold;"><B>Reconstruction \r
+ Limit</B></span> box allows to choose the preferrable result, i.e. a solid, \r
+ a shell, a list of faces, etc.</p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
  </i><span style="font-style: italic;"><I>geompy.MakePartition(ListOfShapes, \r
  ListOfTools, ListOfKeepInside, ListOfRemoveInside, Limit, RemoveWebs, \r
- ListOfMaterials)</I></span>, where ListOfShapes is a list of shapes to be \r
- intersected, ListOfTools is a list of shapes to intersect the shapes from \r
- ListOfShapes. Shapes from these two lists (for each separately)\r
- can not have intersections with each other.\r
- After implementation of a new version of PartitionAlgo (October 2006)\r
- other parameters are ignored by current functionality. They are kept\r
- in this function only for support of old scripts.\r
-</p>\r
-\r
-<p class="whs2"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b style="font-weight: bold;">Arguments:</b> \r
- </font></span><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Name + 2 shapes (the first shape \r
- will be intersected by the second shape) + reconstruction limit.</font></span></p>\r
+ ListOfMaterials)</I></span>, where <span style="font-style: italic;"><I>ListOfShapes</I></span> \r
+ is a list of shapes to be intersected and &nbsp;<span \r
+ style="font-style: italic;"><I>ListOfTools</I></span> \r
+ is a list of shapes to intersect the shapes from ListOfShapes. </p>\r
+\r
+<p class="whs2">Since the implementation of a new version of \r
+ PartitionAlgo other parameters are ignored by the current functionality \r
+ and remain there only to support the old scripts. &nbsp;</p>\r
+\r
+<p class="whs2"><b>Arguments:</b> Name + 2 lists of shapes \r
+ (the shapes from the first list will be intersected with the shapes from \r
+ the second list) + reconstruction limit.</p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs6"><img src="pics/partition1.png" x-maintain-ratio="TRUE" width="400px" height="350px" border="0" class="img_whs7"></p>\r
+<p class="whs5"><img src="pics/partition1.png" x-maintain-ratio="TRUE" width="400px" height="350px" border="0" class="img_whs6"></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
@@ -147,19 +151,17 @@ if (window.writeIntopicBar)
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs6"><img src="pics/partition2.png" x-maintain-ratio="TRUE" width="400px" height="350px" border="0" class="img_whs7"></p>\r
-\r
-<p class="whs6">&nbsp;</p>\r
+<p class="whs5"><img src="pics/partition2.png" x-maintain-ratio="TRUE" width="400px" height="324px" border="0" class="img_whs7"></p>\r
 \r
-<p class="whs6">&nbsp;</p>\r
+<p class="whs5">&nbsp;</p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">Example:</b></p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs6"><img src="pics/partitionsn1.png" x-maintain-ratio="TRUE" width="297px" height="245px" border="0" class="img_whs9"> &nbsp;<img src="pics/partitionsn2.png" x-maintain-ratio="TRUE" width="273px" height="245px" border="0" class="img_whs10"></p>\r
+<p class="whs5"><img src="pics/partitionsn1.png" x-maintain-ratio="TRUE" width="297px" height="245px" border="0" class="img_whs8"> &nbsp;<img src="pics/partitionsn2.png" x-maintain-ratio="TRUE" width="273px" height="245px" border="0" class="img_whs9"></p>\r
 \r
-<p class="whs6">&nbsp;</p>\r
+<p class="whs5">&nbsp;</p>\r
 \r
 <p class="whs2">Our TUI Scripts provide you with useful examples \r
  of the use of <a href="basic_operations.htm#bookmark">Basic Operations</a>. \r

diff --git a/doc/salome/gui/GEOM/pics/partition1.png b/doc/salome/gui/GEOM/pics/partition1.png
index ba25844c4c1d7ebe4cbf1968f7f7bb7c57246995..20b22d296fe7e860dd5da61e340aba75279c2441 100755 (executable)
Binary files a/doc/salome/gui/GEOM/pics/partition1.png and b/doc/salome/gui/GEOM/pics/partition1.png differ

diff --git a/doc/salome/gui/GEOM/pics/partition2.png b/doc/salome/gui/GEOM/pics/partition2.png
index 4fbd02e77088cab7cc136c6781559639c0274178..a67ec9d8bb56c64997b19bb3e7b38701982c0fea 100755 (executable)
Binary files a/doc/salome/gui/GEOM/pics/partition2.png and b/doc/salome/gui/GEOM/pics/partition2.png differ

diff --git a/doc/salome/gui/GEOM/pics/transformation4.png b/doc/salome/gui/GEOM/pics/transformation4.png
index 8313331d6d66953a54941b3d58f7e676fd4579ec..323c3d0ae1722a8526914e105011bb6621b2bfa8 100755 (executable)
Binary files a/doc/salome/gui/GEOM/pics/transformation4.png and b/doc/salome/gui/GEOM/pics/transformation4.png differ

diff --git a/doc/salome/gui/GEOM/pics/transformation4a.png b/doc/salome/gui/GEOM/pics/transformation4a.png
index 7cfeb84ba37ed3ab014a7b6b076a3b7efc705181..64d2d4149c9b4509dc9d0226756b567e9a17e2ac 100644 (file)
Binary files a/doc/salome/gui/GEOM/pics/transformation4a.png and b/doc/salome/gui/GEOM/pics/transformation4a.png differ

diff --git a/doc/salome/gui/GEOM/rotation.htm b/doc/salome/gui/GEOM/rotation.htm
index 19f2c775f7df3dc9ff046ffc138f5694b2850671..056aa8ea52d44aa42cbbc8f182cdd321c71554b3 100755 (executable)
--- a/doc/salome/gui/GEOM/rotation.htm
+++ b/doc/salome/gui/GEOM/rotation.htm
@@ -17,18 +17,22 @@ 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:376px; float:none; border-style:none; }\r
-p.whs5 { margin-left:40px; }\r
-img_whs6 { border:none; width:247px; height:292px; float:none; border-style:none; }\r
-img_whs7 { border:none; width:257px; height:291px; float:none; border-style:none; }\r
-p.whs8 { list-style:disc; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; }\r
+img_whs4 { border:none; width:400px; height:388px; float:none; border-style:none; }\r
+p.whs5 { font-weight:bold; font-size:12pt; }\r
+p.whs6 { font-size:12pt; margin-left:0px; }\r
+img_whs7 { border:none; width:400px; height:432px; float:none; border-style:none; }\r
+p.whs8 { margin-left:40px; }\r
+img_whs9 { border:none; width:247px; height:292px; float:none; border-style:none; }\r
+img_whs10 { border:none; width:257px; height:291px; float:none; border-style:none; }\r
+p.whs11 { list-style:disc; margin-left:0in; margin-right:0in; margin-top:0px; margin-bottom:0px; }\r
 -->\r
 </style><script type="text/javascript" language="JavaScript">\r
 <!--\r
 if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))\r
 {\r
   var strNSS = "<style type='text/css'>";\r
-  strNSS += "p.whs8 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";\r
+  strNSS += "p.whs6 {margin-left:1pt; }";\r
+  strNSS += "p.whs11 {margin-left:1pt;margin-right:1pt;margin-top:1pt;margin-bottom:1pt; }";\r
   strNSS +="</style>";\r
   document.write(strNSS);\r
 }\r
@@ -102,27 +106,17 @@ if (window.writeIntopicBar)
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs2">This operation rotates the initial shape. To \r
- produce a <span style="font-weight: bold;"><B>Rotation</B></span> you need to \r
- define an <span style="font-weight: bold;"><B>Object</B></span> &nbsp;to \r
- be rotated, an <span style="font-weight: bold;"><B>Axis</B></span> of rotation \r
- and an <span style="font-weight: bold;"><B>Angle</B></span> of rotation.</p>\r
-\r
-<p class="whs2"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><span style="font-weight: bold;"><B>Reverse \r
- </B></span>checkbox allows to specify the direction of rotation.</font></span></p>\r
-\r
-<p class="whs2"><span style="font-weight: bold;"><B>Create a copy \r
- </B></span>checkbox allows to keep the initial object, otherwise it will be \r
- removed.</p>\r
-\r
-<p class="whs2"><b style="font-weight: bold;"><span style="font-weight: normal;">The</span> \r
- Result <span style="font-weight: normal;">will be any</span> </b>&nbsp;GEOM_Object.</p>\r
+<p class="whs2">This operation <span style="font-weight: bold;"><B>rotates</B></span> \r
+ the initial shape. </p>\r
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs2">Firstly you can define an <span style="font-weight: bold;"><B>Object</B></span> &nbsp;to \r
- be rotated, an <span style="font-weight: bold;"><B>Axis</B></span> of rotation \r
- and an <span style="font-weight: bold;"><B>Angle</B></span> of rotation.</p>\r
+<p class="whs2"><b style="font-weight: bold;"><span style="font-weight: normal;">The \r
+ first</span> </b><span style="font-weight: bold;"><B>Rotation</B></span> algorithm \r
+ needs you to define an <span style="font-weight: bold;"><B>Object</B></span> \r
+ &nbsp;to be rotated, \r
+ an <span style="font-weight: bold;"><B>Axis</B></span> of rotation and an <span \r
+ style="font-weight: bold;"><B>Angle</B></span> of rotation.</p>\r
 \r
 <p class="whs2"><b style="font-weight: bold;">TUI Command:</b><i> \r
  </i><span style="font-style: italic;"><I>geompy.MakeRotation(Shape, Axis, \r
@@ -131,30 +125,43 @@ if (window.writeIntopicBar)
 <p class="whs2"><b style="font-weight: bold;">Arguments:</b> \r
  1 shape + 1 vector for direction of rotation + 1 angle.</p>\r
 \r
-<p class="whs2">&nbsp;</p>\r
+<p class="whs3">&nbsp;</p>\r
+\r
+<p class="whs3"><img src="pics/transformation4.png" x-maintain-ratio="TRUE" width="400px" height="388px" border="0" class="img_whs4"></p>\r
 \r
 <p class="whs3">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/transformation4.png" x-maintain-ratio="TRUE" width="400px" height="432px" border="0" class="img_whs4"></p>\r
+<p class="whs5"><span style="font-weight: bold; font-size: 12pt;"><font size=3 style="font-size:12pt;"><B>Reverse \r
+ <span style="font-weight: normal;">checkbox allows to specify the direction \r
+ of rotation.</span></B></font></span></p>\r
 \r
-<p class="whs2">&nbsp;</p>\r
+<p class="whs2"><span style="font-weight: bold;"><B>Create a copy \r
+ </B></span>checkbox allows to keep the initial object, otherwise it will be \r
+ removed.</p>\r
+\r
+<p class="whs2"><b style="font-weight: bold;"><span style="font-weight: normal;">The</span> \r
+ Result <span style="font-weight: normal;">will be any</span> </b>GEOM_Object.</p>\r
 \r
-<p class="whs2">Secondly you can define an <span style="font-weight: bold;"><B>Object</B></span> \r
- and three points. Rotation axis will pass through the first point and will be orthogonal\r
- to a plane, defined by the three points. Rotation angle in this case is an angle between\r
- two vectors, directed from the first point to the second and to the third points correspondingly.</p>\r
+<p class="whs3">&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.MakeRotationThreePoints(Shape, CentralPoint, \r
- Point1, Point2)</I></span> </p>\r
+<p class="whs6">The second algorithm allows \r
+ to define the rotated <span style="font-weight: bold;"><B>Object</B></span> by \r
+ three points. Rotation axis will pass through the <span style="font-weight: bold;"><B>Central \r
+ Point</B></span> and will be will be orthogonal to a plane defned by three \r
+ points. In this case rotation <span style="font-weight: bold;"><B>Angle</B></span> \r
+ is the angle between two vectors directed from the first point to the \r
+ second and to the third.</p>\r
 \r
-<p class="whs2"><b style="font-weight: bold;">Arguments:</b> 1 shape + 3 points.</p>\r
+<p class="whs6"><span style="font-weight: bold;"><B>TUI \r
+ Command:</B></span> <span style="font-style: italic;"><I>geompy.MakeRotationThreePoints(Shape, \r
+ CentralPoint, Point1, Point2).</I></span></p>\r
 \r
-<p class="whs2">&nbsp;</p>\r
+<p class="whs6"><span style="font-weight: bold;"><B>Arguments:</B></span> \r
+ 1 shape + 3 points. </p>\r
 \r
-<p class="whs3">&nbsp;</p>\r
+<p class="whs6">&nbsp;</p>\r
 \r
-<p class="whs3"><img src="pics/transformation4a.png" x-maintain-ratio="TRUE" width="400px" height="432px" border="0" class="img_whs4"></p>\r
+<p class="whs3"><img src="pics/transformation4a.png" x-maintain-ratio="TRUE" width="400px" height="432px" border="0" class="img_whs7"></p>\r
 \r
 <p class="whs3">&nbsp;</p>\r
 \r
@@ -162,11 +169,11 @@ if (window.writeIntopicBar)
 \r
 <p class="whs2">&nbsp;</p>\r
 \r
-<p class="whs5"><img src="pics/rotationsn1.png" x-maintain-ratio="TRUE" width="247px" height="292px" border="0" class="img_whs6"> &nbsp;<img src="pics/rotationsn2.png" x-maintain-ratio="TRUE" width="257px" height="291px" border="0" class="img_whs7"></p>\r
+<p class="whs8"><img src="pics/rotationsn1.png" x-maintain-ratio="TRUE" width="247px" height="292px" border="0" class="img_whs9"> &nbsp;<img src="pics/rotationsn2.png" x-maintain-ratio="TRUE" width="257px" height="291px" border="0" class="img_whs10"></p>\r
 \r
-<p class="whs8">&nbsp;&nbsp;</p>\r
+<p class="whs11">&nbsp;&nbsp;</p>\r
 \r
-<p class="whs8"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Our </font></span><span \r
+<p class="whs11"><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#bookmark1">Transformation \r
  Operations</a>. </font></span></p>\r