void ModelAPI_Feature::setResult(const std::shared_ptr<ModelAPI_Result>& theResult)
{
- static Events_Loop* aLoop = Events_Loop::loop();
static Events_ID EVENT_UPD = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
} else {
myResults.push_back(theResult);
}
- // in any case result decomes enabled
+ // in any case result becomes enabled
theResult->setDisabled(theResult, false);
}
void ModelAPI_Feature::removeResult(const std::shared_ptr<ModelAPI_Result>& theResult)
{
theResult->setDisabled(theResult, true);
+ // flush visualisation changes
+ static Events_Loop* aLoop = Events_Loop::loop();
+ static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ aLoop->flush(aRedispEvent);
}
-void ModelAPI_Feature::removeResults(const int theSinceIndex)
+void ModelAPI_Feature::eraseResultFromList(const std::shared_ptr<ModelAPI_Result>& theResult)
+{
+ std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
+ for(; aResIter != myResults.end(); aResIter++) {
+ ResultPtr aRes = *aResIter;
+ if (aRes == theResult) {
+ std::string aGroup = aRes->groupName();
+ aRes->data()->erase();
+ myResults.erase(aResIter);
+
+ static Events_Loop* aLoop = Events_Loop::loop();
+ static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
+ ModelAPI_EventCreator::get()->sendDeleted(document(), aGroup);
+ aECreator->sendUpdated(aRes, EVENT_DISP);
+ break;
+ }
+ }
+}
+
+void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlush)
{
std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
for(int anIndex = 0; anIndex < theSinceIndex && aResIter != myResults.end(); anIndex++)
aResIter++;
+
+ std::string aGroup;
std::list<std::shared_ptr<ModelAPI_Result> >::iterator aNextIter = aResIter;
while( aNextIter != myResults.end()) {
+ aGroup = (*aNextIter)->groupName();
// remove previously erased results: to enable later if needed only actual (of history change)
if (theSinceIndex == 0 && (*aNextIter)->isDisabled()) {
aNextIter = myResults.erase(aNextIter);
aNextIter++;
}
}
+ if (!aGroup.empty() && theFlush) {
+ // flush visualisation changes
+ static Events_Loop* aLoop = Events_Loop::loop();
+ static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ aLoop->flush(aRedispEvent);
+ static Events_ID aDelEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
+ aLoop->flush(aDelEvent);
+ }
}
void ModelAPI_Feature::eraseResults()
void ModelAPI_Feature::erase()
{
+ // if this is the current feature, make the upper feature as current before removing
+ if (document().get() && document()->currentFeature(false).get() == this) {
+ document()->setCurrentFeatureUp();
+ }
+
static Events_Loop* aLoop = Events_Loop::loop();
static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
while (!myResults.empty()) { // remove one by one with messages
std::shared_ptr<ModelAPI_Result> aRes = *(myResults.begin());
- myResults.erase(myResults.begin());
- aECreator->sendDeleted(aRes->document(), aRes->groupName());
- aECreator->sendUpdated(aRes, EVENT_DISP);
+ aRes->setDisabled(aRes, true); // to avoid activation of the Part result
+ if (!myResults.empty()) // disabling result may erase the list (on undo of Part, issue 665)
+ myResults.erase(myResults.begin());
}
ModelAPI_Object::erase();
}
return aFeature;
}
-
bool ModelAPI_Feature::isMacro() const
{
return false;
if (myIsDisabled != theFlag) {
myIsDisabled = theFlag;
if (myIsDisabled) {
- eraseResults();
+ removeResults(0, false); // flush will be in setCurrentFeature
} else {
// enable all disabled previously results
std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
for(; aResIter != myResults.end(); aResIter++) {
- (*aResIter)->setDisabled(*aResIter, false); // just enable results
+ (*aResIter)->setDisabled(*aResIter, false);
}
}
return true;