#include <TDF_Reference.hxx>
#include <TDF_ChildIDIterator.hxx>
#include <TDF_LabelMapHasher.hxx>
+#include <TDF_Delta.hxx>
#include <OSD_File.hxx>
#include <OSD_Path.hxx>
+#include <TDF_AttributeDelta.hxx>
+#include <TDF_AttributeDeltaList.hxx>
+#include <TDF_ListIteratorOfAttributeDeltaList.hxx>
+#include <TDF_ListIteratorOfLabelList.hxx>
#include <climits>
#ifndef WIN32
return aResult;
}
+/// Returns in theDelta labels that has been modified in the latest transaction of theDoc
+static void modifiedLabels(const Handle(TDocStd_Document)& theDoc, TDF_LabelList& theDelta,
+ const bool isRedo = false) {
+ Handle(TDF_Delta) aDelta;
+ if (isRedo)
+ aDelta = theDoc->GetRedos().First();
+ else
+ aDelta = theDoc->GetUndos().Last();
+ TDF_LabelList aDeltaList;
+ aDelta->Labels(aDeltaList); // it clears list, so, use new one and then append to the result
+ for(TDF_ListIteratorOfLabelList aListIter(aDeltaList); aListIter.More(); aListIter.Next()) {
+ theDelta.Append(aListIter.Value());
+ }
+ // add also label of the modified attributes
+ const TDF_AttributeDeltaList& anAttrs = aDelta->AttributeDeltas();
+ for (TDF_ListIteratorOfAttributeDeltaList anAttr(anAttrs); anAttr.More(); anAttr.Next()) {
+ theDelta.Append(anAttr.Value()->Label());
+ }
+}
+
void Model_Document::abortOperation()
{
+ TDF_LabelList aDeltaLabels; // labels that are updated during "abort"
if (!myNestedNum.empty() && !myDoc->HasOpenCommand()) { // abort all what was done in nested
compactNested();
+ // store undo-delta here as undo actually does in the method later
+ int a, aNumTransactions = myTransactions.rbegin()->myOCAFNum;
+ for(a = 0; a < aNumTransactions; a++) {
+ modifiedLabels(myDoc, aDeltaLabels);
+ myDoc->Undo();
+ }
+ for(a = 0; a < aNumTransactions; a++) {
+ myDoc->Redo();
+ }
+
undoInternal(false, false);
myDoc->ClearRedos();
myRedos.clear();
if (!myNestedNum.empty())
(*myNestedNum.rbegin())--;
// roll back the needed number of transactions
- myDoc->AbortCommand();
- for(int a = 0; a < aNumTransactions; a++)
+ // make commit/undo to get the modification delta
+ //myDoc->AbortCommand();
+ if (myDoc->CommitCommand()) {
+ modifiedLabels(myDoc, aDeltaLabels);
myDoc->Undo();
+ }
+ for(int a = 0; a < aNumTransactions; a++) {
+ modifiedLabels(myDoc, aDeltaLabels);
+ myDoc->Undo();
+ }
myDoc->ClearRedos();
}
// abort for all subs, flushes will be later, in the end of root abort
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->abortOperation();
// references may be changed because they are set in attributes on the fly
- myObjs->synchronizeFeatures(true, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
}
bool Model_Document::isOperation() const
if (!myNestedNum.empty())
(*myNestedNum.rbegin())--;
// roll back the needed number of transactions
- for(int a = 0; a < aNumTransactions; a++)
+ TDF_LabelList aDeltaLabels;
+ for(int a = 0; a < aNumTransactions; a++) {
+ if (theSynchronize)
+ modifiedLabels(myDoc, aDeltaLabels);
myDoc->Undo();
+ }
if (theWithSubs) {
// undo for all subs
subDoc(*aSubIter)->undoInternal(theWithSubs, theSynchronize);
}
}
- // after redo of all sub-documents to avoid updates on not-modified data (issue 370)
+ // after undo of all sub-documents to avoid updates on not-modified data (issue 370)
if (theSynchronize) {
- myObjs->synchronizeFeatures(true, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
int aNumRedos = myRedos.rbegin()->myOCAFNum;
myTransactions.push_back(*myRedos.rbegin());
myRedos.pop_back();
- for(int a = 0; a < aNumRedos; a++)
+ TDF_LabelList aDeltaLabels;
+ for(int a = 0; a < aNumRedos; a++) {
+ modifiedLabels(myDoc, aDeltaLabels, true);
myDoc->Redo();
+ }
// redo for all subs
const std::set<std::string> aSubs = subDocuments(true);
subDoc(*aSubIter)->redo();
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
- myObjs->synchronizeFeatures(true, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
aDocToAdd = this;
}
if (aFeature) {
- aDocToAdd->myObjs->addFeature(aFeature, aDocToAdd->currentFeature(false));
+ // searching for feature after which must be added the next feature: this is the current feature
+ // but also all sub-features of this feature
+ FeaturePtr aCurrent = aDocToAdd->currentFeature(false);
+ bool isModified = true;
+ for(CompositeFeaturePtr aComp = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCurrent);
+ aComp.get() && isModified;
+ aComp = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aCurrent)) {
+ isModified = false;
+ int aSubs = aComp->numberOfSubs(false);
+ for(int a = 0; a < aSubs; a++) {
+ FeaturePtr aSub = aComp->subFeature(a, false);
+ if (myObjs->isLater(aSub, aCurrent)) {
+ isModified = true;
+ aCurrent = aSub;
+ }
+ }
+ }
+ aDocToAdd->myObjs->addFeature(aFeature, aCurrent);
if (!aFeature->isAction()) { // do not add action to the data model
if (theMakeCurrent) // after all this feature stays in the document, so make it current
aDocToAdd->setCurrentFeature(aFeature, false);
void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
{
myObjs->moveFeature(theMoved, theAfterThis);
+ if (theAfterThis == currentFeature(true))
+ setCurrentFeature(theMoved, true);
}
void Model_Document::updateHistory(const std::shared_ptr<ModelAPI_Object> theObject)
