#include <ModelAPI_CompositeFeature.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultBody.h>
#include <Events_Loop.h>
#include <Events_Error.h>
#include <TDF_AttributeDeltaList.hxx>
#include <TDF_ListIteratorOfAttributeDeltaList.hxx>
#include <TDF_ListIteratorOfLabelList.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TNaming_SameShapeIterator.hxx>
+#include <TNaming_Iterator.hxx>
+#include <TNaming_NamedShape.hxx>
+#include <TopExp_Explorer.hxx>
#include <climits>
#ifndef WIN32
for (; aSubIter != aSubs.end(); aSubIter++)
subDoc(*aSubIter)->abortOperation();
// references may be changed because they are set in attributes on the fly
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, isRoot());
}
bool Model_Document::isOperation() const
}
// after undo of all sub-documents to avoid updates on not-modified data (issue 370)
if (theSynchronize) {
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
subDoc(*aSubIter)->redo();
// after redo of all sub-documents to avoid updates on not-modified data (issue 370)
- myObjs->synchronizeFeatures(aDeltaLabels, true, isRoot());
+ myObjs->synchronizeFeatures(aDeltaLabels, true, false, isRoot());
// update the current features status
setCurrentFeature(currentFeature(false), false);
}
void Model_Document::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis)
{
+ bool aCurrentUp = theMoved == currentFeature(false);
+ if (aCurrentUp) {
+ setCurrentFeatureUp();
+ }
+
myObjs->moveFeature(theMoved, theAfterThis);
- if (theAfterThis == currentFeature(true))
+ if (aCurrentUp) { // make the moved feature enabled or disabled due to the real status
+ setCurrentFeature(currentFeature(false), false);
+ } else if (theAfterThis == currentFeature(false)) {
+ // must be after move to make enabled all features which are before theMoved
setCurrentFeature(theMoved, true);
+ }
}
void Model_Document::updateHistory(const std::shared_ptr<ModelAPI_Object> theObject)
}
}
- if (theVisible) { // make features below which are not in history also enabled: sketch subs
+ if (theVisible && !theCurrent.get()) { // needed to avoid disabling of PartSet initial constructions
FeaturePtr aNext =
theCurrent.get() ? myObjs->nextFeature(theCurrent) : myObjs->firstFeature();
for (; aNext.get(); aNext = myObjs->nextFeature(theCurrent)) {
}
// make all features after this feature disabled in reversed order (to remove results without deps)
static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
- static Events_ID aCreateEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
- static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
bool aPassed = false; // flag that the current object is already passed in cycle
FeaturePtr anIter = myObjs->lastFeature();
bool aWasChanged = false;
+ bool isCurrentParameter = theCurrent.get() && theCurrent->getKind() == "Parameter";
for(; anIter.get(); anIter = myObjs->nextFeature(anIter, true)) {
// check this before passed become enabled: the current feature is enabled!
if (anIter == theCurrent) aPassed = true;
}
if (anIter->getKind() == "Parameter") {// parameters are always out of the history of features, but not parameters
- if (theCurrent.get() && theCurrent->getKind() != "Parameter")
+ if (!isCurrentParameter)
aDisabledFlag = false;
+ } else if (isCurrentParameter) { // if paramater is active, all other features become enabled (issue 1307)
+ aDisabledFlag = false;
}
+
if (anIter->setDisabled(aDisabledFlag)) {
// state of feature is changed => so feature become updated
static Events_ID anUpdateEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED);
FeaturePtr aCurrent = currentFeature(false);
if (aCurrent.get()) { // if not, do nothing because null is the upper
FeaturePtr aPrev = myObjs->nextFeature(aCurrent, true);
+ // make the higher level composite as current (sketch becomes disabled if line is enabled)
+ if (aPrev.get()) {
+ for(FeaturePtr aComp = ModelAPI_Tools::compositeOwner(aPrev); aComp.get();
+ aComp = ModelAPI_Tools::compositeOwner(aPrev))
+ aPrev = aComp;
+ }
// do not flush: it is called only on remove, it will be flushed in the end of transaction
setCurrentFeature(aPrev, false);
}
return myObjs->lastFeature();
return FeaturePtr();
}
+
+std::shared_ptr<ModelAPI_Feature> Model_Document::producedByFeature(
+ std::shared_ptr<ModelAPI_Result> theResult,
+ const std::shared_ptr<GeomAPI_Shape>& theShape)
+{
+ ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theResult);
+ if (!aBody.get()) {
+ return feature(theResult); // for not-body just returns the feature that produced this result
+ }
+ // otherwise get the shape and search the very initial label for it
+ TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
+ if (aShape.IsNull())
+ return FeaturePtr();
+
+ // for comsolids and compounds all the naming is located in the main object, so, try to use
+ // it first
+ ResultCompSolidPtr aMain = ModelAPI_Tools::compSolidOwner(theResult);
+ if (aMain.get()) {
+ FeaturePtr aMainRes = producedByFeature(aMain, theShape);
+ if (aMainRes)
+ return aMainRes;
+ }
+
+ std::shared_ptr<Model_Data> aBodyData = std::dynamic_pointer_cast<Model_Data>(theResult->data());
+ if (!aBodyData.get() || !aBodyData->isValid())
+ return FeaturePtr();
+
+ TopoDS_Shape anOldShape; // old shape in the pair oldshape->theShape in the named shape
+ TopoDS_Shape aShapeContainer; // old shape of the shape that contains aShape as sub-element
+ Handle(TNaming_NamedShape) aCandidatInThis, aCandidatContainer;
+ TDF_Label aBodyLab = aBodyData->label();
+ // use childs and this label (the lowest priority)
+ TDF_ChildIDIterator aNSIter(aBodyLab, TNaming_NamedShape::GetID(), Standard_True);
+ bool aUseThis = !aNSIter.More();
+ while(anOldShape.IsNull() && (aNSIter.More() || aUseThis)) {
+ Handle(TNaming_NamedShape) aNS;
+ if (aUseThis) {
+ if (!aBodyLab.FindAttribute(TNaming_NamedShape::GetID(), aNS))
+ break;
+ } else {
+ aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value());
+ }
+ for(TNaming_Iterator aShapesIter(aNS); aShapesIter.More(); aShapesIter.Next()) {
+ if (aShapesIter.Evolution() == TNaming_SELECTED || aShapesIter.Evolution() == TNaming_DELETE)
+ continue; // don't use the selection evolution
+ if (aShapesIter.NewShape().IsSame(aShape)) { // found the original shape
+ aCandidatInThis = aNS;
+ if (aCandidatInThis->Evolution() == TNaming_MODIFY)
+ anOldShape = aShapesIter.OldShape();
+ if (!anOldShape.IsNull()) // otherwise may me searching for another item of this shape with longer history
+ break;
+ }
+ // check that the shape contains aShape as sub-shape to fill container
+ if (aShapesIter.NewShape().ShapeType() < aShape.ShapeType() && aCandidatContainer.IsNull()) {
+ TopExp_Explorer anExp(aShapesIter.NewShape(), aShape.ShapeType());
+ for(; anExp.More(); anExp.Next()) {
+ if (aShape.IsSame(anExp.Current())) {
+ aCandidatContainer = aNS;
+ aShapeContainer = aShapesIter.NewShape();
+ }
+ }
+ }
+ }
+ // iterate to the next label or to the body label in the end
+ if (!aUseThis)
+ aNSIter.Next();
+ if (!aNSIter.More()) {
+ if (aUseThis)
+ break;
+ aUseThis = true;
+ }
+ }
+ if (aCandidatInThis.IsNull()) {
+ if (aCandidatContainer.IsNull())
+ return FeaturePtr();
+ // with the lower priority use the higher level shape that contains aShape
+ aCandidatInThis = aCandidatContainer;
+ anOldShape = aShapeContainer;
+ }
+
+ while(!anOldShape.IsNull()) { // searching for the very initial shape that produces this one
+ aShape = anOldShape;
+ anOldShape.Nullify();
+ for(TNaming_SameShapeIterator anIter(aShape, myDoc->Main()); anIter.More(); anIter.Next()) {
+ TDF_Label aNSLab = anIter.Label();
+ Handle(TNaming_NamedShape) aNS;
+ if (aNSLab.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
+ for(TNaming_Iterator aShapesIter(aNS); aShapesIter.More(); aShapesIter.Next()) {
+ if (aShapesIter.Evolution() == TNaming_SELECTED || aShapesIter.Evolution() == TNaming_DELETE)
+ continue; // don't use the selection evolution
+ if (aShapesIter.NewShape().IsSame(aShape)) { // found the original shape
+ aCandidatInThis = aNS;
+ if (aCandidatInThis->Evolution() == TNaming_MODIFY)
+ anOldShape = aShapesIter.OldShape();
+ if (!anOldShape.IsNull()) // otherwise may me searching for another item of this shape with longer history
+ break;
+ }
+ }
+ }
+ }
+ }
+ FeaturePtr aResult;
+ TDF_Label aResultLab = aCandidatInThis->Label();
+ while(aResultLab.Depth() > 3)
+ aResultLab = aResultLab.Father();
+ FeaturePtr aFeature = myObjs->feature(aResultLab);
+ if (aFeature.get()) {
+ if (!aResult.get() || myObjs->isLater(aResult, aFeature)) {
+ aResult = aFeature;
+ }
+ }
+ return aResult;
+}
+
+bool Model_Document::isLater(FeaturePtr theLater, FeaturePtr theCurrent) const
+{
+ return myObjs->isLater(theLater, theCurrent);
+}
