From: mpv <mpv@opencascade.com>
Date: Tue, 26 Nov 2019 11:32:01 +0000 (+0300)
Subject: Issue #18352 : EDF - error when re-opening an HDF splitted pipe.
X-Git-Tag: V9_5_0a1~162
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b32532c62c2c845219e32fc798600fe9be799f2e;p=modules%2Fshaper.git

Issue #18352 : EDF - error when re-opening an HDF splitted pipe.

The problem is that path was not concealed by the pipe, but used in the history generation algorithm.
---

diff --git a/src/FeaturesPlugin/pipe_widget.xml b/src/FeaturesPlugin/pipe_widget.xml
index 6211dbc25..ce17e7cd1 100644
--- a/src/FeaturesPlugin/pipe_widget.xml
+++ b/src/FeaturesPlugin/pipe_widget.xml
@@ -10,7 +10,8 @@
   <shape_selector id="path_object"
                   label="Path object:"
                   tooltip="Select an edge or wire for path"
-                  shape_types="edge wire">
+                  shape_types="edge wire"
+                  concealment="true">
     <validator id="FeaturesPlugin_ValidatorPipePath"/>
   </shape_selector>
   <toolbox id="creation_method">
@@ -19,7 +20,8 @@
       <shape_selector id="binormal"
                       label="Bi-Normal:"
                       tooltip="Select an edge for Bi-Normal"
-                      shape_types="edge">
+                      shape_types="edge"
+                      concealment="true">
         <validator id="GeomValidators_ShapeType" parameters="line"/>
       </shape_selector>
     </box>
@@ -27,7 +29,8 @@
       <multi_selector id="locations_objects"
                       label="Locations:"
                       tooltip="Select one or more vertices to specify the locations"
-                      shape_types="vertex">
+                      shape_types="vertex"
+                      concealment="true">
         <validator id="FeaturesPlugin_ValidatorPipeLocations"/>
       </multi_selector>
     </box>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
index 1aeb1140f..cfed1f199 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_UnifySameDomain.cpp
@@ -114,7 +114,7 @@ void GeomAlgoAPI_UnifySameDomain::build(const GeomShapePtr& theShape,
   if (aResult.IsNull()) {
     return;
   }
-  // taske off the compound if it consists of single sub-shape
+  // take off the compound if it consists of single sub-shape
   if (aResult.ShapeType() == TopAbs_COMPOUND) {
     aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
   }