Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support fuzzy parameter in all boolean operations
[modules/shaper.git]
/
src
/
FeaturesAPI
/
FeaturesAPI_Union.h
diff --git
a/src/FeaturesAPI/FeaturesAPI_Union.h
b/src/FeaturesAPI/FeaturesAPI_Union.h
index bcc6aee2e474f0dbac52457479f0c30126a0c199..022d14130f6b242eefdc2747292e2b5c06fc590d 100644
(file)
--- a/
src/FeaturesAPI/FeaturesAPI_Union.h
+++ b/
src/FeaturesAPI/FeaturesAPI_Union.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
22
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-26,6
+26,7
@@
#include <ModelHighAPI_Interface.h>
#include <ModelHighAPI_Macro.h>
#include <ModelHighAPI_Interface.h>
#include <ModelHighAPI_Macro.h>
+#include <ModelHighAPI_Double.h>
class ModelHighAPI_Dumper;
class ModelHighAPI_Selection;
class ModelHighAPI_Dumper;
class ModelHighAPI_Selection;
@@
-44,20
+45,26
@@
public:
FEATURESAPI_EXPORT
explicit FeaturesAPI_Union(const std::shared_ptr<ModelAPI_Feature>& theFeature,
const std::list<ModelHighAPI_Selection>& theBaseObjects,
FEATURESAPI_EXPORT
explicit FeaturesAPI_Union(const std::shared_ptr<ModelAPI_Feature>& theFeature,
const std::list<ModelHighAPI_Selection>& theBaseObjects,
- const
int theVersion = 0
);
+ const
ModelHighAPI_Double& theFuzzy = ModelHighAPI_Double(1.e-8)
);
/// Destructor.
FEATURESAPI_EXPORT
virtual ~FeaturesAPI_Union();
/// Destructor.
FEATURESAPI_EXPORT
virtual ~FeaturesAPI_Union();
- INTERFACE_
1
(FeaturesPlugin_Union::ID(),
+ INTERFACE_
2
(FeaturesPlugin_Union::ID(),
baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(),
baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(),
- ModelAPI_AttributeSelectionList, /** Base objects */)
+ ModelAPI_AttributeSelectionList, /** Base objects */,
+ fuzzyParam, FeaturesPlugin_Union::FUZZY_PARAM_ID(),
+ ModelAPI_AttributeDouble, /** Fuzzy parameter */)
/// Modify base attribute of the feature.
FEATURESAPI_EXPORT
void setBase(const std::list<ModelHighAPI_Selection>& theBaseObjects);
/// Modify base attribute of the feature.
FEATURESAPI_EXPORT
void setBase(const std::list<ModelHighAPI_Selection>& theBaseObjects);
+ /// Set fuzzy parameter.
+ FEATURESAPI_EXPORT
+ void setFuzzyValue(const ModelHighAPI_Double& theFuzzy);
+
/// Dump wrapped feature
FEATURESAPI_EXPORT
virtual void dump(ModelHighAPI_Dumper& theDumper) const;
/// Dump wrapped feature
FEATURESAPI_EXPORT
virtual void dump(ModelHighAPI_Dumper& theDumper) const;
@@
-71,6
+78,7
@@
typedef std::shared_ptr<FeaturesAPI_Union> UnionPtr;
FEATURESAPI_EXPORT
UnionPtr addUnion(const std::shared_ptr<ModelAPI_Document>& thePart,
const std::list<ModelHighAPI_Selection>& theBaseObjects,
FEATURESAPI_EXPORT
UnionPtr addUnion(const std::shared_ptr<ModelAPI_Document>& thePart,
const std::list<ModelHighAPI_Selection>& theBaseObjects,
+ const ModelHighAPI_Double& fuzzyParam = ModelHighAPI_Double(1.e-8),
const bool keepSubResults = false);
#endif // FeaturesAPI_Union_H_
const bool keepSubResults = false);
#endif // FeaturesAPI_Union_H_