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
Restore deflection management
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
GeomAlgoAPI_Boolean.h
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index d5a08376c3d3163fec204e9ca730396703e9788a..1b07fabae681eb16649c8339cbc421c83683972a 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@
-22,6
+22,7
@@
#include <GeomAlgoAPI.h>
#include <GeomAlgoAPI_MakeShape.h>
#include <GeomAlgoAPI.h>
#include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAlgoAPI_Tools.h>
#include <GeomAPI_Shape.h>
#include <GeomAPI_Shape.h>
@@
-30,41
+31,33
@@
/// \brief Allows to perform of boolean operations
class GeomAlgoAPI_Boolean : public GeomAlgoAPI_MakeShape
{
/// \brief Allows to perform of boolean operations
class GeomAlgoAPI_Boolean : public GeomAlgoAPI_MakeShape
{
-public:
- /// Type of booelan operation
- enum OperationType {
- BOOL_CUT, ///< Cut objects
- BOOL_FUSE, ///< Fuse objects
- BOOL_COMMON ///< Take common part of objects
- };
-
public:
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
const GeomShapePtr theTool,
public:
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
const GeomShapePtr theTool,
- const
Operation
Type theOperationType);
+ const
GeomAlgoAPI_Tools::BOP
Type theOperationType);
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
const ListOfShape& theTools,
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const GeomShapePtr theObject,
const ListOfShape& theTools,
- const
Operation
Type theOperationType);
+ const
GeomAlgoAPI_Tools::BOP
Type theOperationType);
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
const ListOfShape& theTools,
/// Constructor.
GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean(const ListOfShape& theObjects,
const ListOfShape& theTools,
- const
Operation
Type theOperationType);
+ const
GeomAlgoAPI_Tools::BOP
Type theOperationType);
/// Redefinition of the generic method for the Fuse problem: OCCT 30481
GEOMALGOAPI_EXPORT virtual void modified(const GeomShapePtr theOldShape,
/// Redefinition of the generic method for the Fuse problem: OCCT 30481
GEOMALGOAPI_EXPORT virtual void modified(const GeomShapePtr theOldShape,
- ListOfShape& theNewShapes);
+
ListOfShape& theNewShapes);
private:
/// Builds resulting shape.
void build(const ListOfShape& theObjects,
const ListOfShape& theTools,
private:
/// Builds resulting shape.
void build(const ListOfShape& theObjects,
const ListOfShape& theTools,
- const
Operation
Type theOperationType);
+ const
GeomAlgoAPI_Tools::BOP
Type theOperationType);
};
#endif
};
#endif