X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_Intersection.cpp;h=ca74d1ccd7d3e84a403d259568a07583fb413a83;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=5e85db2d38e5cdd0269c9c070f21049f0161545d;hpb=6e421e939851e0de46554ae45a3ca0e1f67cd91d;p=modules%2Fshaper.git

diff --git a/src/FeaturesAPI/FeaturesAPI_Intersection.cpp b/src/FeaturesAPI/FeaturesAPI_Intersection.cpp
index 5e85db2d3..ca74d1ccd 100644
--- a/src/FeaturesAPI/FeaturesAPI_Intersection.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_Intersection.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,10 @@
 #include <ModelHighAPI_Dumper.h>
 #include <ModelHighAPI_Tools.h>
 
+
+static const double DEFAULT_FUZZY = 1.e-5;
+
+
 //==================================================================================================
 FeaturesAPI_Intersection::FeaturesAPI_Intersection(
   const std::shared_ptr<ModelAPI_Feature>& theFeature)
@@ -33,11 +37,21 @@ FeaturesAPI_Intersection::FeaturesAPI_Intersection(
 //==================================================================================================
 FeaturesAPI_Intersection::FeaturesAPI_Intersection(
   const std::shared_ptr<ModelAPI_Feature>& theFeature,
-  const std::list<ModelHighAPI_Selection>& theObjects)
+  const std::list<ModelHighAPI_Selection>& theObjects,
+  const ModelHighAPI_Double& theFuzzy)
 : ModelHighAPI_Interface(theFeature)
 {
   if(initialize()) {
-    fillAttribute(theObjects, myobjects);
+    fillAttribute(theObjects, VAR_NAME(objects));
+    fillAttribute(theFuzzy, VAR_NAME(fuzzyParam));
+
+    // Get the evaluated fuzzy parameter from the attribute!!
+    bool aUseFuzzy = (fuzzyParam()->value() > 0);
+    fillAttribute(aUseFuzzy, VAR_NAME(useFuzzy));
+    if (!aUseFuzzy) {
+      ModelHighAPI_Double aFuzzy(DEFAULT_FUZZY);
+      fillAttribute(aFuzzy, VAR_NAME(fuzzyParam));
+    }
 
     execute();
   }
@@ -52,7 +66,23 @@ FeaturesAPI_Intersection::~FeaturesAPI_Intersection()
 //==================================================================================================
 void FeaturesAPI_Intersection::setObjects(const std::list<ModelHighAPI_Selection>& theObjects)
 {
-  fillAttribute(theObjects, myobjects);
+  fillAttribute(theObjects, VAR_NAME(objects));
+
+  execute();
+}
+
+//==================================================================================================
+void FeaturesAPI_Intersection::setUseFuzzy(bool theUseFuzzy)
+{
+  fillAttribute(theUseFuzzy, VAR_NAME(useFuzzy));
+
+  execute();
+}
+
+//==================================================================================================
+void FeaturesAPI_Intersection::setFuzzyValue(const ModelHighAPI_Double& theFuzzy)
+{
+  fillAttribute(theFuzzy, VAR_NAME(fuzzyParam));
 
   execute();
 }
@@ -65,15 +95,28 @@ void FeaturesAPI_Intersection::dump(ModelHighAPI_Dumper& theDumper) const
 
   AttributeSelectionListPtr anAttrObjects =
     aBase->selectionList(FeaturesPlugin_Intersection::OBJECT_LIST_ID());
+  bool aUseFuzzy = aBase->boolean(FeaturesPlugin_Intersection::USE_FUZZY_ID())->value();
+  AttributeDoublePtr aFuzzy = aBase->real(FeaturesPlugin_Intersection::FUZZY_PARAM_ID());
+
+  theDumper << aBase << " = model.addIntersection(" << aDocName << ", " << anAttrObjects;
+
+  if (aUseFuzzy)
+    theDumper << ", fuzzyParam = " << aFuzzy;
+
+  if (!aBase->data()->version().empty())
+    theDumper << ", keepSubResults = True";
 
-  theDumper << aBase << " = model.addIntersection(" << aDocName << ", "
-            << anAttrObjects << ")" << std::endl;
+  theDumper << ")" << std::endl;
 }
 
 //==================================================================================================
 IntersectionPtr addIntersection(const std::shared_ptr<ModelAPI_Document>& thePart,
-                                const std::list<ModelHighAPI_Selection>& theObjects)
+                                const std::list<ModelHighAPI_Selection>& theObjects,
+                                const ModelHighAPI_Double& theFuzzy,
+                                const bool keepSubResults)
 {
   std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Intersection::ID());
-  return IntersectionPtr(new FeaturesAPI_Intersection(aFeature, theObjects));
+  if (!keepSubResults)
+    aFeature->data()->setVersion("");
+  return IntersectionPtr(new FeaturesAPI_Intersection(aFeature, theObjects, theFuzzy));
 }