Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OCC_development_generic_2006
[modules/geom.git]
/
doc
/
salome
/
gui
/
GEOM
/
boolean_operations.htm
diff --git
a/doc/salome/gui/GEOM/boolean_operations.htm
b/doc/salome/gui/GEOM/boolean_operations.htm
index 86dc17fa85180d5833e54c3f0beae2e088faee2c..8593ee7717212bc6c5607cb196d7c0a535cc797a 100755
(executable)
--- a/
doc/salome/gui/GEOM/boolean_operations.htm
+++ b/
doc/salome/gui/GEOM/boolean_operations.htm
@@
-82,7
+82,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create
vertex and
vector</p>
\r
+<p># create
a vertex and a
vector</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
@@
-95,7
+95,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create cylinder</p>
\r
+<p># create
a
cylinder</p>
\r
\r
<p class="whs1">height = 35</p>
\r
\r
\r
<p class="whs1">height = 35</p>
\r
\r
@@
-106,20
+106,20
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create sphere</p>
\r
+<p># create
a
sphere</p>
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
-<p>#
make
fuse</p>
\r
+<p># fuse</p>
\r
\r
<p class="whs1">fuse = geompy.MakeFuse(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">fuse = geompy.MakeFuse(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
-<p># add objects in study</p>
\r
+<p># add objects in
the
study</p>
\r
\r
<p class="whs1">id_cylinder = geompy.addToStudy(cylinder,
\r
"Cylinder")</p>
\r
\r
<p class="whs1">id_cylinder = geompy.addToStudy(cylinder,
\r
"Cylinder")</p>
\r
@@
-159,7
+159,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create
vertex and
vector</p>
\r
+<p># create
a vertex and a
vector</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
@@
-172,7
+172,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create cylinder</p>
\r
+<p># create
a
cylinder</p>
\r
\r
<p class="whs1">height = 35</p>
\r
\r
\r
<p class="whs1">height = 35</p>
\r
\r
@@
-183,7
+183,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create sphere</p>
\r
+<p># create
a
sphere</p>
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
@@
-196,14
+196,14
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># add objects in study</p>
\r
+<p># add objects in
the
study</p>
\r
\r
<p class="whs1">id_common = geompy.addToStudy(common,
\r
"Common")</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">id_common = geompy.addToStudy(common,
\r
"Common")</p>
\r
\r
<p> </p>
\r
\r
-<p># display results</p>
\r
+<p># display
the
results</p>
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_common)</p>
\r
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_common)</p>
\r
\r
@@
-222,7
+222,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create
vertex and
vector</p>
\r
+<p># create
a vertex and a
vector</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
@@
-235,7
+235,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create cylinder</p>
\r
+<p># create
a
cylinder</p>
\r
\r
<p class="whs1">height = 35</p>
\r
\r
\r
<p class="whs1">height = 35</p>
\r
\r
@@
-246,27
+246,27
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create sphere</p>
\r
+<p># create
a
sphere</p>
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
-<p>#
make
cut</p>
\r
+<p>#cut</p>
\r
\r
<p class="whs1">cut = geompy.MakeCut(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">cut = geompy.MakeCut(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
-<p># add objects in study</p>
\r
+<p># add objects in
the
study</p>
\r
\r
<p class="whs1">id_cut = geompy.addToStudy(cut,
\r
"Cut")</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">id_cut = geompy.addToStudy(cut,
\r
"Cut")</p>
\r
\r
<p> </p>
\r
\r
-<p># display results</p>
\r
+<p># display
the
results</p>
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_cut)</p>
\r
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_cut)</p>
\r
\r
@@
-285,7
+285,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create
vertex and
vector</p>
\r
+<p># create
a vertex and a
vector</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
\r
<p class="whs1">p1 = geompy.MakeVertex(25,
\r
55, 0)</p>
\r
@@
-298,7
+298,7
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create cylinder</p>
\r
+<p># create
a
cylinder</p>
\r
\r
<p class="whs1">height = 35</p>
\r
\r
\r
<p class="whs1">height = 35</p>
\r
\r
@@
-309,27
+309,27
@@
else
\r
<p> </p>
\r
\r
\r
<p> </p>
\r
\r
-<p># create sphere</p>
\r
+<p># create
a
sphere</p>
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">sphere = geompy.MakeSphereR(40)</p>
\r
\r
<p> </p>
\r
\r
-<p># make section</p>
\r
+<p># make
a
section</p>
\r
\r
<p class="whs1">section = geompy.MakeSection(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">section = geompy.MakeSection(cylinder,
\r
sphere)</p>
\r
\r
<p> </p>
\r
\r
-<p># add objects in study</p>
\r
+<p># add objects in
the
study</p>
\r
\r
<p class="whs1">id_section = geompy.addToStudy(section,
\r
"Section")</p>
\r
\r
<p> </p>
\r
\r
\r
<p class="whs1">id_section = geompy.addToStudy(section,
\r
"Section")</p>
\r
\r
<p> </p>
\r
\r
-<p># display results</p>
\r
+<p># display
the
results</p>
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_section)</p>
\r
\r
\r
<p class="whs1">gg.createAndDisplayGO(id_section)</p>
\r
\r