{
TCollection_ExtendedString aPath((const Standard_CString) theFileName);
// remove end-separators
- while(aPath.Length() && (aPath.Value(aPath.Length()) == '\\' || aPath.Value(aPath.Length()) == '/'))
+ while(aPath.Length() &&
+ (aPath.Value(aPath.Length()) == '\\' || aPath.Value(aPath.Length()) == '/'))
aPath.Remove(aPath.Length());
aPath += _separator_;
aPath += theID.c_str();
return aPath;
}
+bool Model_Document::isRoot() const
+{
+ return this == Model_Session::get()->moduleDocument().get();
+}
+
bool Model_Document::load(const char* theFileName)
{
Handle(Model_Application) anApp = Model_Application::getApplication();
- if (this == Model_Session::get()->moduleDocument().get()) {
+ if (isRoot()) {
anApp->setLoadPath(theFileName);
}
TCollection_ExtendedString aPath(DocFileName(theFileName, myID));
if (!isError) {
myDoc->SetUndoLimit(UNDO_LIMIT);
// to avoid the problem that feature is created in the current, not this, document
- Model_Session::get()->setActiveDocument(anApp->getDocument(myID), false);
- synchronizeFeatures(false, true);
- Model_Session::get()->setActiveDocument(Model_Session::get()->moduleDocument(), false);
- Model_Session::get()->setActiveDocument(anApp->getDocument(myID), true);
+ std::shared_ptr<Model_Session> aSession =
+ std::dynamic_pointer_cast<Model_Session>(Model_Session::get());
+ aSession->setActiveDocument(anApp->getDocument(myID), false);
+ aSession->setCheckTransactions(false);
+ synchronizeFeatures(false, true, true);
+ aSession->setCheckTransactions(true);
+ aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
+ aSession->setActiveDocument(anApp->getDocument(myID), true);
}
return !isError;
}
{
// create a directory in the root document if it is not yet exist
Handle(Model_Application) anApp = Model_Application::getApplication();
- if (this == Model_Session::get()->moduleDocument().get()) {
+ if (isRoot()) {
#ifdef WIN32
CreateDirectory(theFileName, NULL);
#else
void Model_Document::close(const bool theForever)
{
std::shared_ptr<ModelAPI_Session> aPM = Model_Session::get();
- if (this != aPM->moduleDocument().get() && this == aPM->activeDocument().get()) {
+ if (!isRoot() && this == aPM->activeDocument().get()) {
aPM->setActiveDocument(aPM->moduleDocument());
+ } else if (isRoot()) {
+ // erase the active document if root is closed
+ aPM->setActiveDocument(DocumentPtr());
}
// close all subs
const std::set<std::string> aSubs = subDocuments(true);
{
if (myDoc->HasOpenCommand()) { // start of nested command
if (myDoc->CommitCommand()) { // commit the current: it will contain all nested after compactification
- (*myTransactions.rbegin())++; // if has open command, the list is not empty
+ myTransactions.rbegin()->myOCAFNum++; // if has open command, the list is not empty
}
myNestedNum.push_back(0); // start of nested operation with zero transactions inside yet
myDoc->OpenCommand();
myDoc->NewCommand();
}
// starts a new operation
- myTransactions.push_back(0);
+ myTransactions.push_back(Transaction());
if (!myNestedNum.empty())
(*myNestedNum.rbegin())++;
myRedos.clear();
int aNumToCompact = *(myNestedNum.rbegin());
int aSumOfTransaction = 0;
for(int a = 0; a < aNumToCompact; a++) {
- aSumOfTransaction += *(myTransactions.rbegin());
+ aSumOfTransaction += myTransactions.rbegin()->myOCAFNum;
myTransactions.pop_back();
}
// the latest transaction is the start of lower-level operation which startes the nested
- *(myTransactions.rbegin()) += aSumOfTransaction;
+ myTransactions.rbegin()->myOCAFNum += aSumOfTransaction;
myNestedNum.pop_back();
}
}
-void Model_Document::finishOperation()
+bool Model_Document::finishOperation()
{
bool isNestedClosed = !myDoc->HasOpenCommand() && !myNestedNum.empty();
static std::shared_ptr<Model_Session> aSession =
std::static_pointer_cast<Model_Session>(Model_Session::get());
- // just to be sure that everybody knows that changes were performed
- if (isNestedClosed) {
- aSession->setCheckTransactions(false); // for nested transaction commit
- }
synchronizeBackRefs();
Events_Loop* aLoop = Events_Loop::loop();
aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
// this must be here just after everything is finished but before real transaction stop
// to avoid messages about modifications outside of the transaction
// and to rebuild everything after all updates and creates
- if (Model_Session::get()->moduleDocument().get() == this) { // once for root document
+ if (isRoot()) { // once for root document
Events_Loop::loop()->autoFlush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
static std::shared_ptr<Events_Message> aFinishMsg
(new Events_Message(Events_Loop::eventByName("FinishOperation")));
// to avoid "updated" message appearance by updater
//aLoop->clear(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
- if (isNestedClosed) {
- aSession->setCheckTransactions(true); // for nested transaction commit
- }
-
// finish for all subs first: to avoid nested finishing and "isOperation" calls problems inside
+ bool aResult = false;
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
- subDoc(*aSubIter)->finishOperation();
+ if (subDoc(*aSubIter)->finishOperation())
+ aResult = true;
- if (myDoc->CommitCommand()) { // if commit is successfull, just increment counters
- (*myTransactions.rbegin())++;
+ // transaction may be empty if this document was created during this transaction (create part)
+ if (!myTransactions.empty() && myDoc->CommitCommand()) { // if commit is successfull, just increment counters
+ myTransactions.rbegin()->myOCAFNum++;
+ aResult = true;
}
if (isNestedClosed) {
compactNested();
}
+ if (!aResult && !myTransactions.empty() /* it can be for just created part document */)
+ aResult = myTransactions.rbegin()->myOCAFNum != 0;
+
+ if (!aResult && isRoot()) {
+ // nothing inside in all documents, so remove this transaction from the transactions list
+ undoInternal(true, false);
+ myDoc->ClearRedos();
+ myRedos.clear();
+ }
+ return aResult;
}
void Model_Document::abortOperation()
{
if (!myNestedNum.empty() && !myDoc->HasOpenCommand()) { // abort all what was done in nested
compactNested();
- undoInternal(false);
+ undoInternal(false, false);
myDoc->ClearRedos();
myRedos.clear();
} else { // abort the current
- int aNumTransactions = *myTransactions.rbegin();
+ int aNumTransactions = myTransactions.rbegin()->myOCAFNum;
myTransactions.pop_back();
if (!myNestedNum.empty())
(*myNestedNum.rbegin())--;
myDoc->Undo();
myDoc->ClearRedos();
}
- synchronizeFeatures(true, false); // references were not changed since transaction start
+ // references were not changed since transaction start
+ synchronizeFeatures(true, false, isRoot());
// abort for all subs
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
subDoc(*aSubIter)->abortOperation();
}
-bool Model_Document::isOperation()
+bool Model_Document::isOperation() const
{
// operation is opened for all documents: no need to check subs
return myDoc->HasOpenCommand() == Standard_True ;
bool Model_Document::canUndo()
{
- if (myDoc->GetAvailableUndos() > 0 && (myNestedNum.empty() || *myNestedNum.rbegin() != 0) &&
- !myTransactions.empty() /* for omitting the first useless transaction */)
+ // issue 406 : if transaction is opened, but nothing to undo behind, can not undo
+ int aCurrentNum = isOperation() ? 1 : 0;
+ if (myDoc->GetAvailableUndos() > 0 &&
+ (myNestedNum.empty() || *myNestedNum.rbegin() - aCurrentNum > 0) && // there is something to undo in nested
+ myTransactions.size() - aCurrentNum > 0 /* for omitting the first useless transaction */)
return true;
// check other subs contains operation that can be undoed
const std::set<std::string> aSubs = subDocuments(true);
return false;
}
-void Model_Document::undoInternal(const bool theWithSubs)
+void Model_Document::undoInternal(const bool theWithSubs, const bool theSynchronize)
{
- int aNumTransactions = *myTransactions.rbegin();
+ int aNumTransactions = myTransactions.rbegin()->myOCAFNum;
+ myRedos.push_back(*myTransactions.rbegin());
myTransactions.pop_back();
- myRedos.push_back(aNumTransactions);
if (!myNestedNum.empty())
(*myNestedNum.rbegin())--;
// roll back the needed number of transactions
myDoc->Undo();
if (theWithSubs) {
- synchronizeFeatures(true, true);
// undo for all subs
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
- subDoc(*aSubIter)->undo();
+ subDoc(*aSubIter)->undoInternal(theWithSubs, theSynchronize);
}
+ // after redo of all sub-documents to avoid updates on not-modified data (issue 370)
+ if (theSynchronize)
+ synchronizeFeatures(true, true, isRoot());
}
void Model_Document::undo()
{
- undoInternal(true);
+ undoInternal(true, true);
}
bool Model_Document::canRedo()
{
- if (myDoc->GetAvailableRedos() > 0)
+ if (!myRedos.empty())
return true;
// check other subs contains operation that can be redoed
const std::set<std::string> aSubs = subDocuments(true);
{
if (!myNestedNum.empty())
(*myNestedNum.rbegin())++;
- int aNumRedos = *myRedos.rbegin();
+ int aNumRedos = myRedos.rbegin()->myOCAFNum;
+ myTransactions.push_back(*myRedos.rbegin());
myRedos.pop_back();
- myTransactions.push_back(aNumRedos);
for(int a = 0; a < aNumRedos; a++)
myDoc->Redo();
- synchronizeFeatures(true, true);
// redo for all subs
const std::set<std::string> aSubs = subDocuments(true);
std::set<std::string>::iterator aSubIter = aSubs.begin();
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->redo();
+
+ // after redo of all sub-documents to avoid updates on not-modified data (issue 370)
+ synchronizeFeatures(true, true, isRoot());
+}
+
+std::list<std::string> Model_Document::undoList() const
+{
+ std::list<std::string> aResult;
+ // the number of skipped current operations (on undo they will be aborted)
+ int aSkipCurrent = isOperation() ? 1 : 0;
+ std::list<Transaction>::const_reverse_iterator aTrIter = myTransactions.crbegin();
+ int aNumUndo = myTransactions.size();
+ if (!myNestedNum.empty())
+ aNumUndo = *myNestedNum.rbegin();
+ for( ; aNumUndo > 0; aTrIter++, aNumUndo--) {
+ if (aSkipCurrent == 0) aResult.push_back(aTrIter->myId);
+ else aSkipCurrent--;
+ }
+ return aResult;
+}
+
+std::list<std::string> Model_Document::redoList() const
+{
+ std::list<std::string> aResult;
+ std::list<Transaction>::const_reverse_iterator aTrIter = myRedos.crbegin();
+ for( ; aTrIter != myRedos.crend(); aTrIter++) {
+ aResult.push_back(aTrIter->myId);
+ }
+ return aResult;
+}
+
+void Model_Document::operationId(const std::string& theId)
+{
+ myTransactions.rbegin()->myId = theId;
}
/// Append to the array of references a new referenced label
FeaturePtr aFeature = ModelAPI_Session::get()->createFeature(theID);
if (!aFeature)
return aFeature;
- std::shared_ptr<Model_Document> aDocToAdd = std::dynamic_pointer_cast<Model_Document>(
- aFeature->documentToAdd());
+ Model_Document* aDocToAdd;
+ if (aFeature->documentToAdd().get()) { // use the customized document to add
+ aDocToAdd = std::dynamic_pointer_cast<Model_Document>(aFeature->documentToAdd()).get();
+ } else { // if customized is not presented, add to "this" document
+ aDocToAdd = this;
+ }
if (aFeature) {
TDF_Label aFeatureLab;
if (!aFeature->isAction()) { // do not add action to the data model
}
/// Appenad to the array of references a new referenced label.
-/// If theIndex is not -1, removes element at thisindex, not theReferenced.
+/// If theIndex is not -1, removes element at this index, not theReferenced.
/// \returns the index of removed element
-static int RemoveFromRefArray(TDF_Label theArrayLab, TDF_Label theReferenced, const int theIndex =
- -1)
+static int RemoveFromRefArray(TDF_Label theArrayLab, TDF_Label theReferenced,
+ const int theIndex = -1)
{
int aResult = -1; // no returned
Handle(TDataStd_ReferenceArray) aRefs;
return aResult;
}
-void Model_Document::removeFeature(FeaturePtr theFeature, const bool theCheck)
+void Model_Document::refsToFeature(FeaturePtr theFeature,
+ std::set<std::shared_ptr<ModelAPI_Feature> >& theRefs,
+ const bool isSendError)
{
- if (theCheck) {
- // check the feature: it must have no depended objects on it
- std::list<ResultPtr>::const_iterator aResIter = theFeature->results().cbegin();
- for(; aResIter != theFeature->results().cend(); aResIter++) {
- std::shared_ptr<Model_Data> aData =
- std::dynamic_pointer_cast<Model_Data>((*aResIter)->data());
- if (aData && !aData->refsToMe().empty()) {
- Events_Error::send(
- "Feature '" + theFeature->data()->name() + "' is used and can not be deleted");
- return;
+ // check the feature: it must have no depended objects on it
+ // the dependencies can be in the feature results
+ std::list<ResultPtr>::const_iterator aResIter = theFeature->results().cbegin();
+ for(; aResIter != theFeature->results().cend(); aResIter++) {
+ ResultPtr aResult = (*aResIter);
+ std::shared_ptr<Model_Data> aData =
+ std::dynamic_pointer_cast<Model_Data>(aResult->data());
+ if (aData.get() != NULL) {
+ const std::set<AttributePtr>& aRefs = aData->refsToMe();
+ std::set<AttributePtr>::const_iterator aRefIt = aRefs.begin(), aRefLast = aRefs.end();
+ for(; aRefIt != aRefLast; aRefIt++) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIt)->owner());
+ if (aFeature.get() != NULL)
+ theRefs.insert(aFeature);
}
}
}
+ // the dependencies can be in the feature itself
+ std::shared_ptr<Model_Data> aData =
+ std::dynamic_pointer_cast<Model_Data>(theFeature->data());
+ if (aData && !aData->refsToMe().empty()) {
+ const std::set<AttributePtr>& aRefs = aData->refsToMe();
+ std::set<AttributePtr>::const_iterator aRefIt = aRefs.begin(), aRefLast = aRefs.end();
+ for(; aRefIt != aRefLast; aRefIt++) {
+ FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*aRefIt)->owner());
+ if (aFeature.get() != NULL)
+ theRefs.insert(aFeature);
+ }
+ }
+ if (!theRefs.empty() && isSendError) {
+ Events_Error::send(
+ "Feature '" + theFeature->data()->name() + "' is used and can not be deleted");
+ }
+}
+
+void Model_Document::removeFeature(FeaturePtr theFeature/*, const bool theCheck*/)
+{
std::shared_ptr<Model_Data> aData = std::static_pointer_cast<Model_Data>(theFeature->data());
if (aData) {
TDF_Label aFeatureLabel = aData->label().Father();
myObjs.UnBind(aFeatureLabel);
else
return; // not found feature => do not remove
+
+ // checking that the sub-element of composite feature is removed: if yes, inform the owner
+ std::set<std::shared_ptr<ModelAPI_Feature> > aRefs;
+ refsToFeature(theFeature, aRefs, false);
+ std::set<std::shared_ptr<ModelAPI_Feature> >::iterator aRefIter = aRefs.begin();
+ for(; aRefIter != aRefs.end(); aRefIter++) {
+ std::shared_ptr<ModelAPI_CompositeFeature> aComposite =
+ std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(*aRefIter);
+ if (aComposite.get()) {
+ aComposite->removeFeature(theFeature);
+ }
+ }
+
// erase fields
theFeature->erase();
+ static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ ModelAPI_EventCreator::get()->sendUpdated(theFeature, EVENT_DISP);
// erase all attributes under the label of feature
aFeatureLabel.ForgetAllAttributes();
// remove it from the references array
if (theFeature->isInHistory()) {
RemoveFromRefArray(featuresLabel(), aFeatureLabel);
}
+ // event: feature is deleted
+ ModelAPI_EventCreator::get()->sendDeleted(theFeature->document(), ModelAPI_Feature::group());
+ }
+}
+
+void Model_Document::addToHistory(const std::shared_ptr<ModelAPI_Object> theObject)
+{
+ TDF_Label aFeaturesLab = featuresLabel();
+ std::shared_ptr<Model_Data> aData = std::static_pointer_cast<Model_Data>(theObject->data());
+ if (!aData) {
+ return; // not found feature => do not remove
+ }
+ TDF_Label aFeatureLabel = aData->label().Father();
+ // store feature in the history of features array
+ if (theObject->isInHistory()) {
+ AddToRefArray(aFeaturesLab, aFeatureLabel);
+ } else {
+ RemoveFromRefArray(aFeaturesLab, aFeatureLabel);
}
- // event: feature is deleted
- ModelAPI_EventCreator::get()->sendDeleted(theFeature->document(), ModelAPI_Feature::group());
}
FeaturePtr Model_Document::feature(TDF_Label& theLabel) const
return ObjectPtr();
}
+std::shared_ptr<ModelAPI_Object> Model_Document::objectByName(
+ const std::string& theGroupID, const std::string& theName)
+{
+ if (theGroupID == ModelAPI_Feature::group()) {
+ int anIndex = 0;
+ TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
+ for (; aLabIter.More(); aLabIter.Next()) {
+ TDF_Label aFLabel = aLabIter.Value()->Label();
+ FeaturePtr aFeature = feature(aFLabel);
+ if (aFeature && aFeature->name() == theName)
+ return aFeature;
+ }
+ } else {
+ // comment must be in any feature: it is kind
+ int anIndex = 0;
+ TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
+ for (; aLabIter.More(); aLabIter.Next()) {
+ TDF_Label aFLabel = aLabIter.Value()->Label();
+ FeaturePtr aFeature = feature(aFLabel);
+ const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
+ std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
+ for (; aRIter != aResults.cend(); aRIter++) {
+ if ((*aRIter)->groupName() == theGroupID && (*aRIter)->data()->name() == theName)
+ return *aRIter;
+ }
+ }
+ }
+ // not found
+ return ObjectPtr();
+}
+
int Model_Document::size(const std::string& theGroupID, const bool theHidden)
{
int aResult = 0;
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObj);
if (aFeature) {
setUniqueName(aFeature); // must be before "initAttributes" because duplicate part uses name
- aFeature->initAttributes();
}
+ theObj->initAttributes();
}
-void Model_Document::synchronizeFeatures(const bool theMarkUpdated, const bool theUpdateReferences)
+void Model_Document::synchronizeFeatures(
+ const bool theMarkUpdated, const bool theUpdateReferences, const bool theFlush)
{
std::shared_ptr<ModelAPI_Document> aThis =
Model_Application::getApplication()->getDocument(myID);
// after all updates, sends a message that groups of features were created or updated
- std::static_pointer_cast<Model_Session>(Model_Session::get())
- ->setCheckTransactions(false);
Events_Loop* aLoop = Events_Loop::loop();
+ static Events_ID aDispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static Events_ID aCreateEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+ static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+ static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static Events_ID aDeleteEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
+ static Events_ID aToHideEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
aLoop->activateFlushes(false);
- // update all objects by checking are they of labels or not
+ // update all objects by checking are they on labels or not
std::set<FeaturePtr> aNewFeatures, aKeptFeatures;
TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID());
for (; aLabIter.More(); aLabIter.Next()) {
if (!myObjs.IsBound(aFeatureLabel)) { // a new feature is inserted
// create a feature
aFeature = ModelAPI_Session::get()->createFeature(
- TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast(aLabIter.Value())->Get())
- .ToCString());
+ TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast(aLabIter.Value())->Get())
+ .ToCString());
if (!aFeature) { // somethig is wrong, most probably, the opened document has invalid structure
Events_Error::send("Invalid type of object in the document");
aLabIter.Value()->Label().ForgetAllAttributes();
initData(aFeature, aFeatureLabel, TAG_FEATURE_ARGUMENTS);
// event: model is updated
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
- ModelAPI_EventCreator::get()->sendUpdated(aFeature, anEvent);
+ ModelAPI_EventCreator::get()->sendUpdated(aFeature, aCreateEvent);
} else { // nothing is changed, both iterators are incremented
aFeature = myObjs.Find(aFeatureLabel);
aKeptFeatures.insert(aFeature);
if (theMarkUpdated) {
- static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
- ModelAPI_EventCreator::get()->sendUpdated(aFeature, anEvent);
+ ModelAPI_EventCreator::get()->sendUpdated(aFeature, anUpdateEvent);
}
}
}
- // update results of thefeatures (after features created because they may be connected, like sketch and sub elements)
+ // update results of the features (after features created because they may be connected, like sketch and sub elements)
std::list<FeaturePtr> aComposites; // composites must be updated after their subs (issue 360)
TDF_ChildIDIterator aLabIter2(featuresLabel(), TDataStd_Comment::GetID());
for (; aLabIter2.More(); aLabIter2.Next()) {
NCollection_DataMap<TDF_Label, FeaturePtr>::Iterator aFIter(myObjs);
while (aFIter.More()) {
if (aKeptFeatures.find(aFIter.Value()) == aKeptFeatures.end()
- && aNewFeatures.find(aFIter.Value()) == aNewFeatures.end()) {
- FeaturePtr aFeature = aFIter.Value();
- // event: model is updated
- //if (aFeature->isInHistory()) {
+ && aNewFeatures.find(aFIter.Value()) == aNewFeatures.end()) {
+ FeaturePtr aFeature = aFIter.Value();
+ // event: model is updated
+ //if (aFeature->isInHistory()) {
ModelAPI_EventCreator::get()->sendDeleted(aThis, ModelAPI_Feature::group());
- //}
- // results of this feature must be redisplayed (hided)
- static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aFeature->results();
- std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRIter = aResults.begin();
- // redisplay also removed feature (used for sketch and AISObject)
- ModelAPI_EventCreator::get()->sendUpdated(aFeature, EVENT_DISP);
- aFeature->erase();
- // unbind after the "erase" call: on abort sketch is removes sub-objects that corrupts aFIter
- TDF_Label aLab = aFIter.Key();
- aFIter.Next();
- myObjs.UnBind(aLab);
+ //}
+ // results of this feature must be redisplayed (hided)
+ // redisplay also removed feature (used for sketch and AISObject)
+ ModelAPI_EventCreator::get()->sendUpdated(aFeature, aRedispEvent);
+ aFeature->erase();
+ // unbind after the "erase" call: on abort sketch is removes sub-objects that corrupts aFIter
+ myObjs.UnBind(aFIter.Key());
+ // reinitialize iterator because unbind may corrupt the previous order in the map
+ aFIter.Initialize(myObjs);
} else
aFIter.Next();
}
myExecuteFeatures = false;
aLoop->activateFlushes(true);
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
- aLoop->flush(Events_Loop::eventByName(EVENT_OBJECT_TOHIDE));
- std::static_pointer_cast<Model_Session>(Model_Session::get())
- ->setCheckTransactions(true);
+ if (theFlush) {
+ aLoop->flush(aCreateEvent);
+ aLoop->flush(aDeleteEvent);
+ aLoop->flush(anUpdateEvent);
+ aLoop->flush(aRedispEvent);
+ aLoop->flush(aToHideEvent);
+ }
myExecuteFeatures = true;
}
if (aFData) {
std::list<std::pair<std::string, std::list<ObjectPtr> > > aRefs;
aFData->referencesToObjects(aRefs);
- std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator aRefsIter = aRefs.begin();
+ std::list<std::pair<std::string, std::list<ObjectPtr> > >::iterator
+ aRefsIter = aRefs.begin();
for(; aRefsIter != aRefs.end(); aRefsIter++) {
std::list<ObjectPtr>::iterator aRefTo = aRefsIter->second.begin();
for(; aRefTo != aRefsIter->second.end(); aRefTo++) {
theResult->setDoc(aThis);
initData(theResult, resultLabel(theFeatureData, theResultIndex), TAG_FEATURE_ARGUMENTS);
if (theResult->data()->name().empty()) { // if was not initialized, generate event and set a name
- theResult->data()->setName(theFeatureData->name());
+ std::stringstream aNewName;
+ aNewName<<theFeatureData->name();
+ if (theResultIndex > 0) // if there are several results, add unique prefix starting from second
+ aNewName<<"_"<<theResultIndex + 1;
+ theResult->data()->setName(aNewName.str());
}
}
