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
Correct XML of a filter GUI
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
GeomAlgoAPI_Boolean.h
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index 3cb2d6e9297f8dc2c679097ab7312352eef1dbcd..32224162bc0d10a1d38f0f3571be27ded0212f2e 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-201
7
CEA/DEN, EDF R&D
+// Copyright (C) 2014-201
9
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
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef GeomAlgoAPI_Boolean_H_
//
#ifndef GeomAlgoAPI_Boolean_H_
@@
-23,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>
@@
-32,31
+32,32
@@
class GeomAlgoAPI_Boolean : public GeomAlgoAPI_MakeShape
{
public:
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,
+ const GeomAlgoAPI_Tools::BOPType 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 OperationType theOperationType);
+ const GeomAlgoAPI_Tools::BOPType theOperationType);
+
+ /// Redefinition of the generic method for the Fuse problem: OCCT 30481
+ GEOMALGOAPI_EXPORT virtual void modified(const GeomShapePtr theOldShape,
+ 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