22756: [EDF] Intersection operation

diff --git a/doc/salome/gui/GEOM/input/section_operation.doc b/doc/salome/gui/GEOM/input/section_operation.doc
index 0b741eed44c2465f905efaf1d4a664bb12547ef8..fc29eb8f1db5b11377796336dbdd056809eb4351 100644 (file)
--- a/doc/salome/gui/GEOM/input/section_operation.doc
+++ b/doc/salome/gui/GEOM/input/section_operation.doc
@@ -2,7 +2,8 @@
 
 \page section_opeartion_page Section
 
 
 \page section_opeartion_page Section
 

-\b Section operation creates an edge or a wire representing the intersection of surfaces of two shapes.
+\b Section operation creates a vertex, an edge, a wire or a compound
+of them representing the intersection of two shapes.

 
 To produce it, select in the main menu <b>Operations - > Boolean - > Section</b>
 
 
 To produce it, select in the main menu <b>Operations - > Boolean - > Section</b>
 


@@ -11,17 +12,10 @@ To produce it, select in the main menu <b>Operations - > Boolean - > Section</b>
 In this dialog:
 - Input or accept the default \b Name of the resulting shape. 
 - Click the arrow button and select in the Object Browser or in the Viewer the intersecting <b>Objects</b>.
 In this dialog:
 - Input or accept the default \b Name of the resulting shape. 
 - Click the arrow button and select in the Object Browser or in the Viewer the intersecting <b>Objects</b>.

-- Activate the corresponding check-box if you wish to <b> Detect Self-intersections </b>.
+- Activate the corresponding check-box if you wish to <b> Detect Self-intersections</b>. If a self-intersection detected the operation fails.

 - Activate \ref restore_presentation_parameters_page "Advanced options" if required.
 - Activate \ref restore_presentation_parameters_page "Advanced options" if required.

-- Press "Apply" or "Apply & Close" button to get the result (EDGE or WIRE).
-
-\note This algorithm does not find all types of self-intersections. It is tuned
-      to detect vertex/vertex, vertex/edge, edge/edge, vertex/face and edge/face
-      intersections. Face/face intersections detection is switched off as it
-      is a time-consuming operation that gives an impact on performance. To find
-      all self-intersections use \ref check_self_intersections_page
-      "Detect Self-intersection tool".
-         
+- Press "Apply" or "Apply & Close" button to get the result (VERTEX, EDGE, WIRE or COMPOUND).
+

 This operation can be performed using a <b>TUI Command:</b> 
 
 <em>geompy.MakeSection(s1, s2, checkSelfInte)</em>
 This operation can be performed using a <b>TUI Command:</b> 
 
 <em>geompy.MakeSection(s1, s2, checkSelfInte)</em>

diff --git a/src/GEOM_SWIG/geomBuilder.py b/src/GEOM_SWIG/geomBuilder.py
index ec10f246749672e17c3bc2e45eb1ebcd6cf4c23c..c3eead5dd0845632d2dd93d455a35da420d3cf70 100644 (file)
--- a/src/GEOM_SWIG/geomBuilder.py
+++ b/src/GEOM_SWIG/geomBuilder.py
@@ -7407,18 +7407,10 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
         #  @param theShape2 Second argument for boolean operation.
         #  @param checkSelfInte The flag that tells if the arguments should
         #         be checked for self-intersection prior to the operation.
         #  @param theShape2 Second argument for boolean operation.
         #  @param checkSelfInte The flag that tells if the arguments should
         #         be checked for self-intersection prior to the operation.

+        #         If a self-intersection detected the operation fails.

         #  @param theName Object name; when specified, this parameter is used
         #         for result publication in the study. Otherwise, if automatic
         #         publication is switched on, default value is used for result name.
         #  @param theName Object name; when specified, this parameter is used
         #         for result publication in the study. Otherwise, if automatic
         #         publication is switched on, default value is used for result name.

-        #
-        #  @note This algorithm doesn't find all types of self-intersections.
-        #        It is tuned to detect vertex/vertex, vertex/edge, edge/edge,
-        #        vertex/face and edge/face intersections. Face/face
-        #        intersections detection is switched off as it is a
-        #        time-consuming operation that gives an impact on performance.
-        #        To find all self-intersections please use
-        #        CheckSelfIntersections() method.
-        #

         #  @return New GEOM.GEOM_Object, containing the result shape.
         #
         #  @ref tui_section "Example 1"
         #  @return New GEOM.GEOM_Object, containing the result shape.
         #
         #  @ref tui_section "Example 1"


@@ -7431,21 +7423,11 @@ class geomBuilder(object, GEOM._objref_GEOM_Gen):
                 theShape1 First argument for boolean operation.
                 theShape2 Second argument for boolean operation.
                 checkSelfInte The flag that tells if the arguments should
                 theShape1 First argument for boolean operation.
                 theShape2 Second argument for boolean operation.
                 checkSelfInte The flag that tells if the arguments should

-                              be checked for self-intersection prior to
-                              the operation.
+                              be checked for self-intersection prior to the operation.
+                              If a self-intersection detected the operation fails.

                 theName Object name; when specified, this parameter is used
                         for result publication in the study. Otherwise, if automatic
                         publication is switched on, default value is used for result name.
                 theName Object name; when specified, this parameter is used
                         for result publication in the study. Otherwise, if automatic
                         publication is switched on, default value is used for result name.

-
-            Note:
-                    This algorithm doesn't find all types of self-intersections.
-                    It is tuned to detect vertex/vertex, vertex/edge, edge/edge,
-                    vertex/face and edge/face intersections. Face/face
-                    intersections detection is switched off as it is a
-                    time-consuming operation that gives an impact on performance.
-                    To find all self-intersections please use
-                    CheckSelfIntersections() method.
-

             Returns:
                 New GEOM.GEOM_Object, containing the result shape.
 
             Returns:
                 New GEOM.GEOM_Object, containing the result shape.