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
Remove extra files
[modules/shaper.git]
/
src
/
Model
/
Model_ResultCompSolid.cpp
diff --git
a/src/Model/Model_ResultCompSolid.cpp
b/src/Model/Model_ResultCompSolid.cpp
index 87241ee29c474db6a7a3b7d313c673febfc2c24d..687b0ea087c94c4c73b15f4ccab4067a6210a473 100755
(executable)
--- a/
src/Model/Model_ResultCompSolid.cpp
+++ b/
src/Model/Model_ResultCompSolid.cpp
@@
-10,8
+10,6
@@
#include <Model_Objects.h>
#include <Model_BodyBuilder.h>
#include <Model_Document.h>
#include <Model_Objects.h>
#include <Model_BodyBuilder.h>
#include <Model_Document.h>
-#include <ModelAPI_AttributeRefList.h>
-#include <ModelAPI_AttributeIntArray.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#include <Events_Loop.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#include <Events_Loop.h>
@@
-32,15
+30,10
@@
Model_ResultCompSolid::~Model_ResultCompSolid()
updateSubs(std::shared_ptr<GeomAPI_Shape>()); // erase sub-results
}
updateSubs(std::shared_ptr<GeomAPI_Shape>()); // erase sub-results
}
-void Model_ResultCompSolid::initAttributes()
+void Model_ResultCompSolid::store(const std::shared_ptr<GeomAPI_Shape>& theShape,
+ const bool theIsStoreSameShapes)
{
{
- DataPtr aData = data();
- aData->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId());
-}
-
-void Model_ResultCompSolid::store(const std::shared_ptr<GeomAPI_Shape>& theShape)
-{
- ModelAPI_ResultCompSolid::store(theShape);
+ ModelAPI_ResultCompSolid::store(theShape, theIsStoreSameShapes);
updateSubs(theShape);
}
updateSubs(theShape);
}
@@
-60,7
+53,7
@@
void Model_ResultCompSolid::storeModified(const std::shared_ptr<GeomAPI_Shape>&
int Model_ResultCompSolid::numberOfSubs(bool forTree) const
{
int Model_ResultCompSolid::numberOfSubs(bool forTree) const
{
- return
mySubs.size(
);
+ return
int(mySubs.size()
);
}
std::shared_ptr<ModelAPI_ResultBody> Model_ResultCompSolid::subResult(const int theIndex,
}
std::shared_ptr<ModelAPI_ResultBody> Model_ResultCompSolid::subResult(const int theIndex,
@@
-86,7
+79,8
@@
void Model_ResultCompSolid::colorConfigInfo(std::string& theSection, std::string
theDefault = DEFAULT_COLOR();
}
theDefault = DEFAULT_COLOR();
}
-bool Model_ResultCompSolid::setDisabled(std::shared_ptr<ModelAPI_Result> theThis, const bool theFlag)
+bool Model_ResultCompSolid::setDisabled(std::shared_ptr<ModelAPI_Result> theThis,
+ const bool theFlag)
{
bool aChanged = ModelAPI_ResultBody::setDisabled(theThis, theFlag);
if (aChanged) { // state is changed, so modifications are needed
{
bool aChanged = ModelAPI_ResultBody::setDisabled(theThis, theFlag);
if (aChanged) { // state is changed, so modifications are needed