Copyright update 2022

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Sewing.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Sewing.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Sewing.cpp
index 4539b086399653dab79acee6262cf0ab7c27aea3..3d9630ecf05164ac581e4f03dfffae614b862ef9 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Sewing.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Sewing.cpp
@@ -1,9 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        GeomAlgoAPI_Sewing.cpp
-// Created:     25 April 2016
-// Author:      Dmitry Bobylev
-
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "GeomAlgoAPI_Sewing.h"
 
@@ -38,22 +50,26 @@ void GeomAlgoAPI_Sewing::build(const ListOfShape& theShapes)
 
   TopoDS_Shape aResult = aSewingBuilder->SewedShape();
   BRep_Builder aBuilder;
-  TopoDS_Compound aResultCompound;
-  aBuilder.MakeCompound(aResultCompound);
-  for(TopoDS_Iterator anIt(aResult); anIt.More(); anIt.Next()) {
-    const TopoDS_Shape aSubShape = anIt.Value();
-    if(aSubShape.ShapeType() == TopAbs_SHELL) {
-      aBuilder.Add(aResultCompound, aSubShape);
-    } else if (aSubShape.ShapeType() == TopAbs_FACE) {
-      TopoDS_Shell aShell;
-      aBuilder.MakeShell(aShell);
-      aBuilder.Add(aShell, aSubShape);
-      aBuilder.Add(aResultCompound, aShell);
+  if(aResult.ShapeType() == TopAbs_COMPOUND) {
+    TopoDS_Compound aResultCompound;
+    aBuilder.MakeCompound(aResultCompound);
+    for(TopoDS_Iterator anIt(aResult); anIt.More(); anIt.Next()) {
+      const TopoDS_Shape aSubShape = anIt.Value();
+      if(aSubShape.ShapeType() == TopAbs_SHELL) {
+        aBuilder.Add(aResultCompound, aSubShape);
+      } else if (aSubShape.ShapeType() == TopAbs_FACE) {
+        TopoDS_Shell aShell;
+        aBuilder.MakeShell(aShell);
+        aBuilder.Add(aShell, aSubShape);
+        aBuilder.Add(aResultCompound, aShell);
+      }
     }
-  }
-  TopoDS_Iterator anIt(aResultCompound);
-  if(anIt.More()) {
     aResult = aResultCompound;
+  } else if(aResult.ShapeType() == TopAbs_FACE) {
+    TopoDS_Shell aShell;
+    aBuilder.MakeShell(aShell);
+    aBuilder.Add(aShell, aResult);
+    aResult = aShell;
   }
 
   std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
@@ -63,10 +79,11 @@ void GeomAlgoAPI_Sewing::build(const ListOfShape& theShapes)
 }
 
 //==================================================================================================
+#include <GeomAPI_ShapeIterator.h>
+
 void GeomAlgoAPI_Sewing::modified(const std::shared_ptr<GeomAPI_Shape> theShape,
                                   ListOfShape& theHistory)
 {
-  static int anIndex = 0;
   if(!theShape.get()) {
     return;
   }
@@ -84,4 +101,21 @@ void GeomAlgoAPI_Sewing::modified(const std::shared_ptr<GeomAPI_Shape> theShape,
     aGeomShape->setImpl(new TopoDS_Shape(anExp.Current()));
     theHistory.push_back(aGeomShape);
   }
+
+  if (theShape->shapeType() < GeomAPI_Shape::FACE) {
+    ListOfShape aNewShapes;
+    // collect faces and parent shapes, if it is not done yet
+    if (!isNewShapesCollected(theShape, GeomAPI_Shape::FACE))
+      collectNewShapes(theShape, GeomAPI_Shape::FACE);
+
+    for (GeomAPI_ShapeIterator anIt(shape()); anIt.more(); anIt.next()) {
+      GeomShapePtr anOldShapesCompound =
+          oldShapesForNew(theShape, anIt.current(), GeomAPI_Shape::FACE);
+      if (!anOldShapesCompound->isNull())
+        aNewShapes.push_back(anIt.current());
+    }
+
+    if (!aNewShapes.empty())
+      theHistory = aNewShapes;
+  }
 }