Change the paradigm of versioning of Boolean Operations on the Python API level.

[modules/shaper.git] / src / FeaturesAPI / FeaturesAPI_BooleanFuse.cpp

diff --git a/src/FeaturesAPI/FeaturesAPI_BooleanFuse.cpp b/src/FeaturesAPI/FeaturesAPI_BooleanFuse.cpp
index cd7e08afda985fc848f6df262841dcdeba8e7fcf..a80b069082843fd50028d1f6d5ef34350cd8f5c2 100644 (file)
--- a/src/FeaturesAPI/FeaturesAPI_BooleanFuse.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_BooleanFuse.cpp
@@ -138,23 +138,23 @@ void FeaturesAPI_BooleanFuse::dump(ModelHighAPI_Dumper& theDumper) const
     theDumper << ", " << aTools;
   }
 
-  bool hasVersion = aVersion && aVersion->isInitialized();
-  if (aRemoveEdges->value() || hasVersion) {
-    theDumper << ", " << aRemoveEdges->value();
+  if (aRemoveEdges->value()) {
+    theDumper << ", removeEdges = True";
   }
 
-  if (hasVersion) {
-    theDumper << ", " << aVersion->value();
+  if (aVersion && aVersion->isInitialized() &&
+      aVersion->value() == FeaturesPlugin_VersionedBoolean::THE_VERSION_1) {
+    theDumper << ", keepSubResults = True";
   }
 
   theDumper << ")" << std::endl;
 }
 
 //==================================================================================================
-BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
-                       const std::list<ModelHighAPI_Selection>& theObjects,
-                       const bool theRemoveEdges,
-                       const int theVersion)
+static BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
+                              const std::list<ModelHighAPI_Selection>& theObjects,
+                              const bool theRemoveEdges,
+                              const int theVersion)
 {
   std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_BooleanFuse::ID());
   return BooleanFusePtr(new FeaturesAPI_BooleanFuse(aFeature,
@@ -164,11 +164,11 @@ BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
 }
 
 //==================================================================================================
-BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
-                   const std::list<ModelHighAPI_Selection>& theMainObjects,
-                   const std::list<ModelHighAPI_Selection>& theToolObjects,
-                   const bool theRemoveEdges,
-                   const int theVersion)
+static BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
+                              const std::list<ModelHighAPI_Selection>& theMainObjects,
+                              const std::list<ModelHighAPI_Selection>& theToolObjects,
+                              const bool theRemoveEdges,
+                              const int theVersion)
 {
   std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_BooleanFuse::ID());
   return BooleanFusePtr(new FeaturesAPI_BooleanFuse(aFeature,
@@ -177,3 +177,20 @@ BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
                                                     theRemoveEdges,
                                                     theVersion));
 }
+
+//==================================================================================================
+BooleanFusePtr addFuse(const std::shared_ptr<ModelAPI_Document>& thePart,
+                       const std::list<ModelHighAPI_Selection>& theMainObjects,
+                       const std::pair<std::list<ModelHighAPI_Selection>, bool>& theToolObjects,
+                       const bool theRemoveEdges,
+                       const bool keepSubResults)
+{
+  int aVersion = keepSubResults ? FeaturesPlugin_VersionedBoolean::THE_VERSION_1
+                                : FeaturesPlugin_VersionedBoolean::THE_VERSION_0;
+  bool aRemoveEdges = theRemoveEdges;
+  if (theToolObjects.first.empty())
+    aRemoveEdges = aRemoveEdges || theToolObjects.second;
+  return theToolObjects.first.empty() ?
+      addFuse(thePart, theMainObjects, aRemoveEdges, aVersion) :
+      addFuse(thePart, theMainObjects, theToolObjects.first, aRemoveEdges, aVersion);
+}