return myResults;
}
-std::shared_ptr<ModelAPI_Result> ModelAPI_Feature::firstResult()
+std::shared_ptr<ModelAPI_Result> ModelAPI_Feature::firstResult() const
{
return myResults.empty() ? std::shared_ptr<ModelAPI_Result>() : *(myResults.begin());
}
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();
}
// in any case result becomes enabled
theResult->setDisabled(theResult, false);
- // flush vidualisation changes
- static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- aLoop->flush(aRedispEvent);
}
void ModelAPI_Feature::setResult(const std::shared_ptr<ModelAPI_Result>& theResult,
*aResIter = theResult;
}
theResult->setDisabled(theResult, false);
- // 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::removeResult(const std::shared_ptr<ModelAPI_Result>& theResult)
aRes->data()->erase();
myResults.erase(aResIter);
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
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();
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 (theFlush) {
+ 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);
}
}
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();
}