setCurrentFeature(currentFeature(false), false);
aSession->setCheckTransactions(true);
aSession->setActiveDocument(Model_Session::get()->moduleDocument(), false);
- aSession->setActiveDocument(anApp->getDocument(myID), true);
+ // this is done in Part result "activate", so no needed here. Causes not-blue active part.
+ //aSession->setActiveDocument(anApp->getDocument(myID), true);
}
return !isError;
}
}
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
if (theSynchronize) {
+ myObjs->synchronizeFeatures(true, true, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
- myObjs->synchronizeFeatures(true, true, isRoot());
}
}
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->redo();
- // update the current features status
- setCurrentFeature(currentFeature(false), false);
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
myObjs->synchronizeFeatures(true, true, isRoot());
+ // update the current features status
+ setCurrentFeature(currentFeature(false), false);
}
std::list<std::string> Model_Document::undoList() const
aDocToAdd = this;
}
if (aFeature) {
- aDocToAdd->myObjs->addFeature(aFeature, currentFeature(false));
+ aDocToAdd->myObjs->addFeature(aFeature, aDocToAdd->currentFeature(false));
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
- setCurrentFeature(aFeature, false);
+ aDocToAdd->setCurrentFeature(aFeature, false);
} else { // feature must be executed
// no creation event => updater not working, problem with remove part
aFeature->execute();
{
// if this feature is current, make the current the previous feature
if (theFeature == currentFeature(false)) {
- int aCurrentIndex = index(theFeature);
- if (aCurrentIndex != -1) {
- ObjectPtr aPrevObj;
- if (aCurrentIndex != 0)
- aPrevObj = object(ModelAPI_Feature::group(), aCurrentIndex - 1);
- setCurrentFeature(std::dynamic_pointer_cast<ModelAPI_Feature>(aPrevObj), false);
- }
+ FeaturePtr aPrev = myObjs->nextFeature(theFeature, true);
+ setCurrentFeature(aPrev, false);
}
myObjs->removeFeature(theFeature);
}
TDF_Label aRefLab = generalLabel().FindChild(TAG_CURRENT_FEATURE);
CompositeFeaturePtr aMain; // main feature that may nest the new current
if (theCurrent.get()) {
- /*
- if (theVisible) { // make features below which are not in history also enabled: sketch subs
- FeaturePtr aNext = myObjs->nextFeature(theCurrent);
- for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
- if (aNext->isInHistory()) {
- break; // next in history is not needed
- } else { // next not in history is good for making current
- theCurrent = aNext;
- }
- }
- }*/
aMain = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(theCurrent);
if (!aMain.get()) {
// if feature nests into compisite feature, make the composite feature as current
}
}
}
+ }
+ if (theVisible) { // make features below which are not in history also enabled: sketch subs
+ FeaturePtr aNext =
+ theCurrent.get() ? myObjs->nextFeature(theCurrent) : myObjs->firstFeature();
+ for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
+ if (aNext->isInHistory()) {
+ break; // next in history is not needed
+ } else { // next not in history is good for making current
+ theCurrent = aNext;
+ }
+ }
+ }
+ if (theCurrent.get()) {
std::shared_ptr<Model_Data> aData = std::static_pointer_cast<Model_Data>(theCurrent->data());
if (!aData.get()) return; // unknown case
TDF_Label aFeatureLabel = aData->label().Father();
if (anIter == theCurrent) aPassed = true;
bool aDisabledFlag = !aPassed;
- if (aMain.get() && aMain->isSub(anIter))
+ if (aMain.get() && aMain->isSub(anIter)) // sub-elements of not-disabled feature are not disabled
+ aDisabledFlag = false;
+ if (anIter->getKind() == "Parameter") // parameters are always out of the history
aDisabledFlag = false;
if (anIter->setDisabled(aDisabledFlag)) {
// state of feature is changed => so feature become updated