From 79facc579ee940046b26e3e31308760f2caa9534 Mon Sep 17 00:00:00 2001
From: David Osterberg <davost@gmail.com>
Date: Tue, 23 Feb 2021 13:35:05 +0100
Subject: [PATCH] PartDesign: Transformed: Allow explict selection of overlap
 mode

---
 src/Mod/PartDesign/App/FeatureTransformed.cpp | 23 +++++++++++--------
 src/Mod/PartDesign/App/FeatureTransformed.h   |  8 +++++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/Mod/PartDesign/App/FeatureTransformed.cpp b/src/Mod/PartDesign/App/FeatureTransformed.cpp
index 9e638f32d7..cd35a4e3e6 100644
--- a/src/Mod/PartDesign/App/FeatureTransformed.cpp
+++ b/src/Mod/PartDesign/App/FeatureTransformed.cpp
@@ -60,6 +60,8 @@ using namespace PartDesign;
 
 namespace PartDesign {
 
+const char* Transformed::OverlapEnums[] = { "Detect", "Overlap mode", "Non-overlap mode", NULL};
+
 PROPERTY_SOURCE(PartDesign::Transformed, PartDesign::Feature)
 
 Transformed::Transformed()
@@ -69,6 +71,8 @@ Transformed::Transformed()
     Placement.setStatus(App::Property::ReadOnly, true);
 
     ADD_PROPERTY_TYPE(Refine,(0),"Part Design",(App::PropertyType)(App::Prop_None),"Refine shape (clean up redundant edges) after adding/subtracting");
+    ADD_PROPERTY_TYPE(Overlap, (0L), "Transform", App::Prop_None, "Feature overlapping behaviour");
+    Overlap.setEnums(OverlapEnums);
 
     //init Refine property
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
@@ -201,6 +205,8 @@ short Transformed::mustExecute() const
 
 App::DocumentObjectExecReturn *Transformed::execute(void)
 {
+    std::string overlapMode = Overlap.getValueAsString();
+    bool overlapDetectionMode = overlapMode == "Detect";
 
 #ifndef FC_DEBUG
     std::clock_t start0;
@@ -302,27 +308,24 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
             shapes.emplace_back(shape);
             builder.Add(compShape, shape);
 
-            overlapping =  overlapping || (countSolids(TopoShape(origShape).fuse(shape))==1);
+            if (overlapDetectionMode)
+                overlapping =  overlapping || (countSolids(TopoShape(origShape).fuse(shape))==1);
 
         }
 
         TopoDS_Shape toolShape;
 
-        if (overlapping) {
-
 #ifndef FC_DEBUG
+        if (overlapping || overlapMode == "Overlap mode")
             Base::Console().Message("Transformed: Overlapping feature mode (fusing tool shapes)\n");
-#endif
-
-            toolShape = TopoShape(origShape).fuse(shapes, Precision::Confusion());
-        } else {
-
-#ifndef FC_DEBUG
+        else
             Base::Console().Message("Transformed: Non-Overlapping feature mode (compound of tool shapes)\n");
 #endif
 
+        if (overlapping || overlapMode == "Overlap mode")
+            toolShape = TopoShape(origShape).fuse(shapes, Precision::Confusion());
+        else
             toolShape = compShape;
-        }
 
         if (!fuseShape.isNull()) {
             std::unique_ptr<BRepAlgoAPI_BooleanOperation> mkBool(new BRepAlgoAPI_Fuse(current, toolShape));
diff --git a/src/Mod/PartDesign/App/FeatureTransformed.h b/src/Mod/PartDesign/App/FeatureTransformed.h
index ccb807ba43..b3ab64bc77 100644
--- a/src/Mod/PartDesign/App/FeatureTransformed.h
+++ b/src/Mod/PartDesign/App/FeatureTransformed.h
@@ -50,12 +50,13 @@ public:
     App::PropertyLinkList Originals;
 
     App::PropertyBool Refine;
+    App::PropertyEnumeration Overlap;
 
     /**
      * Returns the BaseFeature property's object(if any) otherwise return first original,
      *         which serves as "Support" for old style workflows
      * @param silent if couldn't determine the base feature and silent == true,
-     *               silently return a nullptr, otherwise throw Base::Exception. 
+     *               silently return a nullptr, otherwise throw Base::Exception.
      *               Default is false.
      */
     virtual Part::Feature* getBaseObject(bool silent=false) const;
@@ -93,9 +94,12 @@ protected:
     virtual void positionBySupport(void);
     TopoDS_Shape refineShapeIfActive(const TopoDS_Shape&) const;
     void divideTools(const std::vector<TopoDS_Shape> &toolsIn, std::vector<TopoDS_Shape> &individualsOut,
-		     TopoDS_Compound &compoundOut) const; 
+		     TopoDS_Compound &compoundOut) const;
 
     rejectedMap rejected;
+
+private:
+    static const char* OverlapEnums[];
 };
 
 } //namespace PartDesign