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
Updated copyright comment
[modules/shaper.git]
/
src
/
FeaturesAPI
/
FeaturesAPI_Union.h
diff --git
a/src/FeaturesAPI/FeaturesAPI_Union.h
b/src/FeaturesAPI/FeaturesAPI_Union.h
index 022d14130f6b242eefdc2747292e2b5c06fc590d..ca8e0ca36580b2f2a041a9011847014e82dc71cd 100644
(file)
--- a/
src/FeaturesAPI/FeaturesAPI_Union.h
+++ b/
src/FeaturesAPI/FeaturesAPI_Union.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-202
2 CEA/DEN, EDF R&D
+// Copyright (C) 2014-202
4 CEA, EDF
//
// 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
@@
-45,15
+45,17
@@
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 ModelHighAPI_Double& theFuzzy = ModelHighAPI_Double(
1.e-8
));
+ const ModelHighAPI_Double& theFuzzy = ModelHighAPI_Double(
-1
));
/// Destructor.
FEATURESAPI_EXPORT
virtual ~FeaturesAPI_Union();
/// Destructor.
FEATURESAPI_EXPORT
virtual ~FeaturesAPI_Union();
- INTERFACE_
2
(FeaturesPlugin_Union::ID(),
+ INTERFACE_
3
(FeaturesPlugin_Union::ID(),
baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(),
ModelAPI_AttributeSelectionList, /** Base objects */,
baseObjects, FeaturesPlugin_Union::BASE_OBJECTS_ID(),
ModelAPI_AttributeSelectionList, /** Base objects */,
+ useFuzzy, FeaturesPlugin_Union::USE_FUZZY_ID(),
+ ModelAPI_AttributeBoolean, /** Use Fuzzy parameter*/,
fuzzyParam, FeaturesPlugin_Union::FUZZY_PARAM_ID(),
ModelAPI_AttributeDouble, /** Fuzzy parameter */)
fuzzyParam, FeaturesPlugin_Union::FUZZY_PARAM_ID(),
ModelAPI_AttributeDouble, /** Fuzzy parameter */)
@@
-61,6
+63,10
@@
public:
FEATURESAPI_EXPORT
void setBase(const std::list<ModelHighAPI_Selection>& theBaseObjects);
FEATURESAPI_EXPORT
void setBase(const std::list<ModelHighAPI_Selection>& theBaseObjects);
+ /// Set use fuzzy parameter.
+ FEATURESAPI_EXPORT
+ void setUseFuzzy(bool theUseFuzzy);
+
/// Set fuzzy parameter.
FEATURESAPI_EXPORT
void setFuzzyValue(const ModelHighAPI_Double& theFuzzy);
/// Set fuzzy parameter.
FEATURESAPI_EXPORT
void setFuzzyValue(const ModelHighAPI_Double& theFuzzy);
@@
-78,7
+84,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 ModelHighAPI_Double& fuzzyParam = ModelHighAPI_Double(
-1
),
const bool keepSubResults = false);
#endif // FeaturesAPI_Union_H_
const bool keepSubResults = false);
#endif // FeaturesAPI_Union_H_