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
crash fix: mirror (line, axis of sketch), select with rectangle, delete
[modules/shaper.git]
/
src
/
Model
/
Model_BodyBuilder.h
diff --git
a/src/Model/Model_BodyBuilder.h
b/src/Model/Model_BodyBuilder.h
index 5097fc17ddab71867a196925fe4db492b88da40c..0941d38b2aaf990b7709af4fb8442a5264808b3c 100755
(executable)
--- a/
src/Model/Model_BodyBuilder.h
+++ b/
src/Model/Model_BodyBuilder.h
@@
-18,7
+18,7
@@
class TNaming_Builder;
/**\class Model_BodyBuilder
* \ingroup DataModel
/**\class Model_BodyBuilder
* \ingroup DataModel
- * \brief
The body (shape) result of a feature
.
+ * \brief
Extra API for the ResultBody that allows to work with naming
.
*/
class Model_BodyBuilder : public ModelAPI_BodyBuilder
{
*/
class Model_BodyBuilder : public ModelAPI_BodyBuilder
{
@@
-27,7
+27,8
@@
class Model_BodyBuilder : public ModelAPI_BodyBuilder
std::vector<TNaming_Builder*> myBuilders;
public:
/// Stores the shape (called by the execution method).
std::vector<TNaming_Builder*> myBuilders;
public:
/// Stores the shape (called by the execution method).
- MODEL_EXPORT virtual void store(const std::shared_ptr<GeomAPI_Shape>& theShape);
+ MODEL_EXPORT virtual void store(const std::shared_ptr<GeomAPI_Shape>& theShape,
+ const bool theIsStoreSameShapes = true);
/// Stores the generated shape (called by the execution method).
MODEL_EXPORT virtual void storeGenerated(const std::shared_ptr<GeomAPI_Shape>& theFromShape,
/// Stores the generated shape (called by the execution method).
MODEL_EXPORT virtual void storeGenerated(const std::shared_ptr<GeomAPI_Shape>& theFromShape,
@@
-42,6
+43,10
@@
public:
const std::shared_ptr<GeomAPI_Shape>& theNewShape,
const int theDecomposeSolidsTag = 0);
const std::shared_ptr<GeomAPI_Shape>& theNewShape,
const int theDecomposeSolidsTag = 0);
+ /// Stores the shape without naming support
+ /// \param theShape shape to store
+ MODEL_EXPORT virtual void storeWithoutNaming(const std::shared_ptr<GeomAPI_Shape>& theShape);
+
/// Returns the shape-result produced by this feature
MODEL_EXPORT virtual std::shared_ptr<GeomAPI_Shape> shape();
/// Returns the shape-result produced by this feature
MODEL_EXPORT virtual std::shared_ptr<GeomAPI_Shape> shape();
@@
-79,7
+84,8
@@
public:
const int theKindOfShape,
const int theTag,
const std::string& theName,
const int theKindOfShape,
const int theTag,
const std::string& theName,
- GeomAPI_DataMapOfShapeShape& theSubShapes);
+ GeomAPI_DataMapOfShapeShape& theSubShapes,
+ const bool theIsStoreSeparate = false);
/// load and orient generated shapes
MODEL_EXPORT virtual void loadAndOrientGeneratedShapes (
GeomAlgoAPI_MakeShape* theMS,
/// load and orient generated shapes
MODEL_EXPORT virtual void loadAndOrientGeneratedShapes (
GeomAlgoAPI_MakeShape* theMS,
@@
-105,7
+111,12
@@
public:
/// (theFlag = true) and back (theFlag = false)
MODEL_EXPORT virtual void evolutionToSelection(const bool theFlag);
/// (theFlag = true) and back (theFlag = false)
MODEL_EXPORT virtual void evolutionToSelection(const bool theFlag);
+ /// Returns true if the latest modification of this body in the naming history
+ // is equal to the given shape
+ MODEL_EXPORT virtual bool isLatestEqual(const std::shared_ptr<GeomAPI_Shape>& theShape);
+
protected:
protected:
+ /// Default constructor accessible only by Model_Objects
Model_BodyBuilder(ModelAPI_Object* theOwner);
/// Removes the stored builders
Model_BodyBuilder(ModelAPI_Object* theOwner);
/// Removes the stored builders