From: Jérôme <jerome.lucas@cesgenslab.fr>
Date: Mon, 7 Dec 2020 13:28:54 +0000 (+0100)
Subject: #20441 : Fix issue in algo
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ce19450b99bcb98c23fcd5a26cd40c1f746dab9b;p=modules%2Fshaper.git

#20441 : Fix issue in algo
---

diff --git a/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp b/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
index c5d3afd93..718b16356 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_SharedFaces.cpp
@@ -61,17 +61,6 @@ void FeaturesPlugin_SharedFaces::initAttributes()
   data()->addAttribute(GROUP_NAME_ID(), ModelAPI_AttributeString::typeId());
 
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), GROUP_NAME_ID());
-  boolean(CREATE_GROUP_ID())->setValue(false);
-}
-
-void explodeCompound(const GeomShapePtr& theCompound, ListOfShape& theSubs)
-{
-  if (theCompound->isCompound() || theCompound->isCompSolid()) {
-    GeomAPI_ShapeIterator anIt(theCompound);
-    for (; anIt.more(); anIt.next())
-      explodeCompound(anIt.current(), theSubs);
-  } else
-    theSubs.push_back(theCompound);
 }
 
 //=================================================================================================
@@ -126,13 +115,14 @@ void FeaturesPlugin_SharedFaces::attributeChanged(const std::string& theID)
       if (aShape) {
         std::string anError;
         ListOfShape aFaces;
-        ListOfShape theSubs;
-        explodeCompound(aShape, theSubs);
-        if( !GetSharedredFaces( theSubs,
-                                aFaces,
-                                true,
-                                anError))
-          setError("Error in GetSharedredFaces calculation :" +  anError);
+        ListOfShape theShapes;
+
+        theShapes.push_back(aShape);
+        if (!GetSharedFaces(theShapes,
+                               aFaces,
+                               false,
+                               anError))
+          setError("Error in GetSharedFaces calculation :" +  anError);
 
         AttributeSelectionListPtr aFacesListAttr =
                     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>
@@ -149,7 +139,7 @@ void FeaturesPlugin_SharedFaces::attributeChanged(const std::string& theID)
           GeomShapePtr aFacePtr = *anIt;
 
           if (!aFacePtr.get()) {
-            setError("GetSharedredFaces : An invalid face found " +  anError);
+            setError("GetSharedFaces : An invalid face found " +  anError);
           }
           aFacesListAttr->append( ancompSolidAttr->context(), aFacePtr);
         }
diff --git a/src/FeaturesPlugin/sharedFaces_widget.xml b/src/FeaturesPlugin/sharedFaces_widget.xml
index 960c960c6..3e08994fd 100644
--- a/src/FeaturesPlugin/sharedFaces_widget.xml
+++ b/src/FeaturesPlugin/sharedFaces_widget.xml
@@ -11,7 +11,7 @@
   <groupbox title="Shared faces">
     <label id="number_shared_faces"/>
     <multi_selector id="faces"
-                      label="Liste of faces :"
+                      label="List of faces :"
                       icon=""
                       shape_types="faces"
                       Block_selection = "true"
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
index a2039bbe3..791126741 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.cpp
@@ -57,14 +57,14 @@
 //     Result: sub-shapes of all possible couples of all top-level sub-objects of
 //     theShapes[0].
 //=================================================================================================
-bool GetSharedredFaces(const ListOfShape& theShapes,
-                       ListOfShape & theFaces,
-                       const bool  theMultiShare,
-                       std::string& theError)
+bool GetSharedFaces(const ListOfShape& theShapes,
+                    ListOfShape & theFaces,
+                    const bool  theMultiShare,
+                    std::string& theError)
 {
 
   #ifdef _DEBUG
-  std::cout << "GetSharedredFaces " << std::endl;
+  std::cout << "GetSharedFaces " << std::endl;
   #endif
   int aLen = theShapes.size();
   if (aLen < 1) return NULL;
@@ -81,7 +81,7 @@ bool GetSharedredFaces(const ListOfShape& theShapes,
     GeomShapePtr aShapePtr = *anIt;
 
     if (!aShapePtr.get()) {
-      theError = "GetSharedredFaces : An invalid argument";
+      theError = "GetSharedFaces : An invalid argument";
       return false;
     }
     aShape = aShapePtr->impl<TopoDS_Shape>();
@@ -102,9 +102,9 @@ bool GetSharedredFaces(const ListOfShape& theShapes,
   // find shared shapes
 
   // number of iterations
-  int nbIters  =  theMultiShare || theShapes.size() > 1 ? 1 : aShapesSeq.Length()-1;
+  int nbIters  = theMultiShare || theShapes.size() > 1 ? 1 : aShapesSeq.Length()-1;
   // numShares factor to search (i.e. by what nb of shapes each found sub-shape should be shared)
-  int nbShares =  theMultiShare ? aShapesSeq.Length()-1 : 1;
+  int nbShares = theMultiShare ? aShapesSeq.Length()-1 : 1;
 
   for (int iter = 1; iter <= nbIters; iter++) {
     for (int ind = iter+1; ind <= aShapesSeq.Length(); ind++) {
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
index 6aa21b0b9..ffc45e59e 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SharedFaces.h
@@ -30,9 +30,9 @@
 /// \param theFaces  the faces shared
 /// \param theError  error
 GEOMALGOAPI_EXPORT
-bool GetSharedredFaces(const ListOfShape& theShapes,
-                       ListOfShape & theFaces,
-                       const bool  theMultiShare,
-                       std::string& theError);
+bool GetSharedFaces(const ListOfShape& theShapes,
+                    ListOfShape & theFaces,
+                    const bool  theMultiShare,
+                    std::string& theError);
 
 #endif //GEOMALGOAPI_SHAREDFACES_H_
diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 7b7876165..711c74093 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -269,4 +269,6 @@ ADD_UNIT_TESTS(TestConstants.py
                Test19707.py
                Test19726.py
                Test19912.py
+               Test19932.py
+               Test19989.py
 )