Copyright update 2020

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_BooleanFuse.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp
index 84df36d061a8ef547e4d8daed7d064d5ee205a78..2eb87085dc165d7e1a546ac460e6ab615f3139ca 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_BooleanFuse.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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
@@ -41,8 +41,6 @@
 #include <GeomAPI_ShapeExplorer.h>
 #include <GeomAPI_ShapeIterator.h>
 
-static const int THE_FUSE_VERSION_1 = 20190506;
-
 //==================================================================================================
 FeaturesPlugin_BooleanFuse::FeaturesPlugin_BooleanFuse()
 : FeaturesPlugin_Boolean(FeaturesPlugin_Boolean::BOOL_FUSE)
@@ -62,23 +60,14 @@ void FeaturesPlugin_BooleanFuse::initAttributes()
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), OBJECT_LIST_ID());
   ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TOOL_LIST_ID());
 
-  AttributePtr aVerAttr = data()->addAttribute(VERSION_ID(), ModelAPI_AttributeInteger::typeId());
-  aVerAttr->setIsArgument(false);
-  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), VERSION_ID());
-  if (!integer(VERSION_ID())->isInitialized() &&
-      !selectionList(OBJECT_LIST_ID())->isInitialized() &&
-      !selectionList(TOOL_LIST_ID())->isInitialized()) {
-    // this is a newly created feature (not read from file),
-    // so, initialize the latest version
-    integer(VERSION_ID())->setValue(THE_FUSE_VERSION_1);
-  }
+  initVersion(BOP_VERSION_9_4(), selectionList(OBJECT_LIST_ID()), selectionList(TOOL_LIST_ID()));
 }
 
 //==================================================================================================
 void FeaturesPlugin_BooleanFuse::execute()
 {
   std::string anError;
-  ObjectHierarchy anObjectsHierarchy, aToolsHierarchy;
+  GeomAPI_ShapeHierarchy anObjectsHierarchy, aToolsHierarchy;
   ListOfShape aPlanes;
 
   bool isSimpleCreation = false;
@@ -101,9 +90,9 @@ void FeaturesPlugin_BooleanFuse::execute()
 
   ListOfShape anObjects, aTools, anEdgesAndFaces;
   // all objects except edges and faces
-  anObjectsHierarchy.ObjectsByType(anEdgesAndFaces, anObjects,
+  anObjectsHierarchy.objectsByType(anEdgesAndFaces, anObjects,
                                    GeomAPI_Shape::FACE, GeomAPI_Shape::EDGE);
-  aToolsHierarchy.ObjectsByType(anEdgesAndFaces, aTools,
+  aToolsHierarchy.objectsByType(anEdgesAndFaces, aTools,
                                 GeomAPI_Shape::FACE, GeomAPI_Shape::EDGE);
 
   if ((anObjects.size() + aTools.size() + anEdgesAndFaces.size()) < 2) {
@@ -113,7 +102,7 @@ void FeaturesPlugin_BooleanFuse::execute()
   }
 
   // version of FUSE feature
-  int aFuseVersion = version();
+  const std::string aFuseVersion = data()->version();
 
   // Collecting all solids which will be fused.
   ListOfShape aSolidsToFuse;
@@ -122,19 +111,20 @@ void FeaturesPlugin_BooleanFuse::execute()
 
   // Collecting solids from compsolids which will not be modified
   // in boolean operation and will be added to result.
+  bool isProcessCompsolid = !isSimpleCreation || !aFuseVersion.empty();
   ListOfShape aShapesToAdd;
-  for (ObjectHierarchy::Iterator anObjectsIt = anObjectsHierarchy.Begin();
-       !isSimpleCreation && anObjectsIt != anObjectsHierarchy.End();
+  for (GeomAPI_ShapeHierarchy::iterator anObjectsIt = anObjectsHierarchy.begin();
+       isProcessCompsolid && anObjectsIt != anObjectsHierarchy.end();
        ++anObjectsIt) {
     GeomShapePtr anObject = *anObjectsIt;
-    GeomShapePtr aParent = anObjectsHierarchy.Parent(anObject, false);
+    GeomShapePtr aParent = anObjectsHierarchy.parent(anObject, false);
 
     if (aParent && aParent->shapeType() == GeomAPI_Shape::COMPSOLID) {
       // mark all subs of this parent as precessed to avoid handling twice
-      aParent = anObjectsHierarchy.Parent(anObject);
+      aParent = anObjectsHierarchy.parent(anObject);
 
       ListOfShape aUsed, aNotUsed;
-      anObjectsHierarchy.SplitCompound(aParent, aUsed, aNotUsed);
+      anObjectsHierarchy.splitCompound(aParent, aUsed, aNotUsed);
       aShapesToAdd.insert(aShapesToAdd.end(), aNotUsed.begin(), aNotUsed.end());
     }
   }
@@ -153,8 +143,11 @@ void FeaturesPlugin_BooleanFuse::execute()
       aMakeShapeList->appendAlgo(aCutAlgo);
     }
   }
-  anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(),
-                          anEdgesAndFaces.end());
+
+  if (aShapesToAdd.empty() || !aCuttedEdgesAndFaces) {
+    anOriginalShapes.insert(anOriginalShapes.end(), anEdgesAndFaces.begin(),
+                            anEdgesAndFaces.end());
+  }
 
   // If we have compsolids then cut with not used solids all others.
   if (!aShapesToAdd.empty()) {
@@ -241,7 +234,7 @@ void FeaturesPlugin_BooleanFuse::execute()
     aMakeShapeList->appendAlgo(aUnifyAlgo);
   }
 
-  if (aFuseVersion == THE_FUSE_VERSION_1) {
+  if (aFuseVersion == BOP_VERSION_9_4()) {
     // merge hierarchies of compounds containing objects and tools
     // and append the result of the FUSE operation
     aShape = keepUnusedSubsOfCompound(aShape, anObjectsHierarchy, aToolsHierarchy, aMakeShapeList);