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
Update unit tests according to new behavior of sketch's MultiRotation/MultiTranslation
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_CompositeBoolean.h
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h
b/src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h
index 1e6a28175fff134bfeb721c6c1761c1d7306aadf..fd2fee853b0accaa82b72a299231afbec8ee05e6 100644
(file)
--- a/
src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h
+++ b/
src/FeaturesPlugin/FeaturesPlugin_CompositeBoolean.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
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 FeaturesPlugin_CompositeBoolean_H_
//
#ifndef FeaturesPlugin_CompositeBoolean_H_
@@
-47,9
+46,18
@@
public:
return MY_OBJECTS_ID;
}
return MY_OBJECTS_ID;
}
- ///
Creates a new part document if needed
.
+ ///
Performs the algorithm and stores results it in the data structure
.
FEATURESPLUGIN_EXPORT virtual void executeCompositeBoolean();
FEATURESPLUGIN_EXPORT virtual void executeCompositeBoolean();
+ const OperationType& operationType() const { return myOperationType; }
+
+protected:
+ struct ResultBaseAlgo {
+ ResultBodyPtr resultBody;
+ GeomShapePtr baseShape;
+ std::shared_ptr<GeomAlgoAPI_MakeShape> makeShape;
+ };
+
protected:
FeaturesPlugin_CompositeBoolean(){};
protected:
FeaturesPlugin_CompositeBoolean(){};
@@
-72,15
+80,18
@@
protected:
/// Stores generation history.
virtual void storeGenerationHistory(ResultBodyPtr theResultBody,
const GeomShapePtr theBaseShape,
/// Stores generation history.
virtual void storeGenerationHistory(ResultBodyPtr theResultBody,
const GeomShapePtr theBaseShape,
- const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
- int& theTag) = 0;
+ const GeomMakeShapePtr theMakeShape) = 0;
/// Stores modification history.
void storeModificationHistory(ResultBodyPtr theResultBody,
const GeomShapePtr theObject,
const ListOfShape& theTools,
/// Stores modification history.
void storeModificationHistory(ResultBodyPtr theResultBody,
const GeomShapePtr theObject,
const ListOfShape& theTools,
- const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
- int& theTag);
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape);
+
+ /// Stores deleted shapes.
+ void storeDeletedShapes(std::vector<ResultBaseAlgo>& theResultBaseAlgoList,
+ const ListOfShape& theTools,
+ const GeomShapePtr theResultShapesCompound);
protected:
ModelAPI_Feature* myFeature;
protected:
ModelAPI_Feature* myFeature;