#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>
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);
}
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,
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
myBuilder->evolutionToSelection(theFlag);
- updateSubs(shape()); // to set disabled/enabled
+ updateSubs(shape()); // to set disabled/enabled
}
return aChanged;
}
aResult = true;
} else {
std::vector<std::shared_ptr<ModelAPI_ResultBody> >::const_iterator aSubIter = mySubs.cbegin();
- for(; aSubIter != mySubs.cend(); aSubIter++)
- if ((*aSubIter)->isConcealed())
+ for(; aSubIter != mySubs.cend(); aSubIter++) {
+ if ((*aSubIter)->ModelAPI_ResultBody::isConcealed()) {
aResult = true;
+ break;
+ }
+ }
}
if (myLastConcealed != aResult) {
myLastConcealed = aResult;
- setIsConcealed(aResult); // set for all subs the same result
+ //setIsConcealed(aResult); // set for all subs the same result
+ std::vector<std::shared_ptr<ModelAPI_ResultBody> >::const_iterator aSubIter = mySubs.cbegin();
+ for(; aSubIter != mySubs.cend(); aSubIter++) { // update the visualization status of each sub
+ if ((*aSubIter)->ModelAPI_ResultBody::isConcealed() != aResult) {
+ if (aResult) { // hidden unit must be redisplayed (hidden)
+ ModelAPI_EventCreator::get()->sendDeleted(document(), (*aSubIter)->groupName());
+ // redisplay for the viewer (it must be disappeared also)
+ static Events_ID EVENT_DISP =
+ Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, EVENT_DISP);
+ } else { // was not concealed become concealed => delete event
+ static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+ ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, anEvent);
+ }
+ }
+ }
+ // update the display state of the subs: explicitly call Model_ResultBody::isConcealed
+ for(aSubIter = mySubs.cbegin(); aSubIter != mySubs.cend(); aSubIter++) {
+ (*aSubIter)->isConcealed();
+ }
}
return aResult;
}
void Model_ResultCompSolid::setIsConcealed(const bool theValue)
{
- ModelAPI_ResultCompSolid::setIsConcealed(theValue);
- std::vector<std::shared_ptr<ModelAPI_ResultBody> >::const_iterator aSubIter = mySubs.cbegin();
- for(; aSubIter != mySubs.cend(); aSubIter++) {
- if ((*aSubIter)->isConcealed() != theValue) {
- (*aSubIter)->setIsConcealed(theValue);
- if (theValue) { // hidden unit must be redisplayed (hidden)
- ModelAPI_EventCreator::get()->sendDeleted(document(), (*aSubIter)->groupName());
- // redisplay for the viewer (it must be disappeared also)
- static Events_ID EVENT_DISP =
- Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, EVENT_DISP);
- } else { // was not concealed become concealed => delete event
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
- ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, anEvent);
+ if (theValue != ModelAPI_ResultCompSolid::isConcealed()) {
+ std::vector<std::shared_ptr<ModelAPI_ResultBody> >::const_iterator aSubIter = mySubs.cbegin();
+ for(; aSubIter != mySubs.cend(); aSubIter++) {
+ if ((*aSubIter)->ModelAPI_ResultBody::isConcealed() != theValue) {
+ if (theValue) { // hidden unit must be redisplayed (hidden)
+ ModelAPI_EventCreator::get()->sendDeleted(document(), (*aSubIter)->groupName());
+ // redisplay for the viewer (it must be disappeared also)
+ static Events_ID EVENT_DISP =
+ Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, EVENT_DISP);
+ } else { // was not concealed become concealed => delete event
+ static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+ ModelAPI_EventCreator::get()->sendUpdated(*aSubIter, anEvent);
+ }
}
}
+ ModelAPI_ResultCompSolid::setIsConcealed(theValue);
+ // to set correct myLastConcealed
+ isConcealed();
}
+ //myLastConcealed = theValue;
}
void Model_ResultCompSolid::updateSubs(const std::shared_ptr<GeomAPI_Shape>& theThisShape)
bool aWasEmpty = mySubs.empty();
Model_Objects* anObjects = std::dynamic_pointer_cast<Model_Document>(document())->objects();
unsigned int aSubIndex = 0;
- TopExp_Explorer aSolids(aThisShape, TopAbs_SOLID);
- for(; aSolids.More(); aSolids.Next(), aSubIndex++) {
- std::shared_ptr<GeomAPI_Shape> aSolidShape(new GeomAPI_Shape);
- aSolidShape->setImpl(new TopoDS_Shape(aSolids.Current()));
+ TopoDS_Iterator aShapesIter(aThisShape);
+ for(; aShapesIter.More(); aShapesIter.Next(), aSubIndex++) {
+ std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
+ aShape->setImpl(new TopoDS_Shape(aShapesIter.Value()));
ResultBodyPtr aSub;
if (mySubs.size() <= aSubIndex) { // it is needed to create a new sub-result
aSub = anObjects->createBody(this->data(), aSubIndex);
} else { // just update shape of this result
aSub = mySubs[aSubIndex];
}
- if (!aSolidShape->isEqual(aSub->shape())) {
- aSub->store(aSolidShape);
+ if (!aShape->isEqual(aSub->shape())) {
+ aSub->store(aShape, false);
aECreator->sendUpdated(aSub, EVENT_DISP);
aECreator->sendUpdated(aSub, EVENT_UPD);
}
bool Model_ResultCompSolid::isLatestEqual(const std::shared_ptr<GeomAPI_Shape>& theShape)
{
- return myBuilder->isLatestEqual(theShape);
+ if (myBuilder->isLatestEqual(theShape))
+ return true;
+ // also check that it is asked for sub-elements
+ std::vector<std::shared_ptr<ModelAPI_ResultBody> >::const_iterator aSubIter = mySubs.cbegin();
+ for(; aSubIter != mySubs.cend(); aSubIter++) {
+ if (aSubIter->get() && (*aSubIter)->isLatestEqual(theShape)) {
+ return true;
+ }
+ }
+ return false;
}
