X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Objects.cpp;h=152aaaeb84ee27a8c4211c1c3d3618dae7221f50;hb=8d9373fd00a410b2e9fc7ac6b0653716314ded2d;hp=1eb9349d564c4485455c2a1a2c81b5ba30a458ce;hpb=93d2d70f5dd018318be3e157dabc4a920b1da6ba;p=modules%2Fshaper.git diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp index 1eb9349d5..152aaaeb8 100644 --- a/src/Model/Model_Objects.cpp +++ b/src/Model/Model_Objects.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -26,13 +25,15 @@ #include #include #include -#include #include #include #include +#include #include #include #include +#include + #include #include @@ -42,28 +43,41 @@ #include #include #include -#include #include #include #include #include #include +int kUNDEFINED_FEATURE_INDEX = -1; + static const std::string& groupNameFoldering(const std::string& theGroupID, const bool theAllowFolder) { if (theAllowFolder) { - static std::map aNames; - std::map::const_iterator aFound = aNames.find(theGroupID); - if (aFound == aNames.end()) { - aNames[theGroupID] = std::string("__") + theGroupID; - aFound = aNames.find(theGroupID); - } - return aFound->second; + static const std::string anOutOfFolderName = std::string("__") + ModelAPI_Feature::group(); + static const std::string aDummyName; + return theGroupID == ModelAPI_Feature::group() ? anOutOfFolderName : aDummyName; } return theGroupID; } +// Check theFeature is a first or last feature in folder and return this folder +static FolderPtr inFolder(const FeaturePtr& theFeature, const std::string& theFolderAttr) +{ + const std::set& aRefs = theFeature->data()->refsToMe(); + for (std::set::iterator anIt = aRefs.begin(); anIt != aRefs.end(); ++anIt) { + if ((*anIt)->id() != theFolderAttr) + continue; + + ObjectPtr anOwner = (*anIt)->owner(); + FolderPtr aFolder = std::dynamic_pointer_cast(anOwner); + if (aFolder.get()) + return aFolder; + } + return FolderPtr(); +} + static const int TAG_OBJECTS = 2; // tag of the objects sub-tree (features, results) @@ -85,7 +99,7 @@ void Model_Objects::setOwner(DocumentPtr theDoc) myDoc = theDoc; // update all fields and recreate features and result objects if needed TDF_LabelList aNoUpdated; - synchronizeFeatures(aNoUpdated, true, true, true, true); + synchronizeFeatures(aNoUpdated, true, false, true, true); myHistory.clear(); } @@ -138,7 +152,7 @@ static void AddToRefArray(TDF_Label& theArrayLab, TDF_Label& theReferenced, TDF_ } else { // extend array by one more element Handle(TDataStd_HLabelArray1) aNewArray = new TDataStd_HLabelArray1(aRefs->Lower(), aRefs->Upper() + 1); - int aPassedPrev = 0; // prev feature is found and passed + int aPassedPrev = 0; // previous feature is found and passed if (thePrevLab.IsNull()) { // null means that inserted feature must be the first aNewArray->SetValue(aRefs->Lower(), theReferenced); aPassedPrev = 1; @@ -164,12 +178,24 @@ void Model_Objects::addFeature(FeaturePtr theFeature, const FeaturePtr theAfterT // store feature in the features array: before "initData" because in macro features // in initData it creates new features, appeared later than this TDF_Label aPrevFeateureLab; + FolderPtr aParentFolder; if (theAfterThis.get()) { // searching for the previous feature label std::shared_ptr aPrevData = std::dynamic_pointer_cast(theAfterThis->data()); if (aPrevData.get()) { aPrevFeateureLab = aPrevData->label().Father(); } + // Check if the previous feature is the last feature in a folder, + // then the folder should be updated to contain additional feature. + // Macro features are not stored in folder. + if (!theFeature->isMacro()) { + // If the last feature is a sub-feature of composite, use parent feature + // to check belonging to a folder. + FeaturePtr afterThis = ModelAPI_Tools::compositeOwner(theAfterThis); + if (!afterThis) + afterThis = theAfterThis; + aParentFolder = inFolder(afterThis, ModelAPI_Folder::LAST_FEATURE_ID()); + } } AddToRefArray(aFeaturesLab, aFeatureLab, aPrevFeateureLab); @@ -187,6 +213,12 @@ void Model_Objects::addFeature(FeaturePtr theFeature, const FeaturePtr theAfterT // must be after binding to the map because of "Box" macro feature that // creates other features in "initData" initData(theFeature, aFeatureLab, TAG_FEATURE_ARGUMENTS); + // put feature to the end of folder if it is added while + // the history line is set to the last feature from the folder + if (aParentFolder) { + aParentFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID())->setValue(theFeature); + updateHistory(ModelAPI_Folder::group()); + } // event: feature is added, mist be before "initData" to update OB correctly on Duplicate: // first new part, then the content static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED); @@ -281,10 +313,12 @@ void Model_Objects::removeFeature(FeaturePtr theFeature) for(; aRefIter != aRefs.end(); aRefIter++) { std::shared_ptr aComposite = std::dynamic_pointer_cast(*aRefIter); - if (aComposite.get() && aComposite->isSub(theFeature)) { + if (aComposite.get() && aComposite->data()->isValid() && aComposite->isSub(theFeature)) { aComposite->removeFeature(theFeature); } } + // remove feature from folder + removeFromFolder(std::list(1, theFeature)); // this must be before erase since theFeature erasing removes all information about // the feature results and groups of results // To reproduce: create sketch, extrusion, remove sketch => constructions tree is not updated @@ -333,7 +367,7 @@ void Model_Objects::eraseAllFeatures() } kCreator->sendDeleted(myDoc, ModelAPI_Feature::group()); myFeatures.Clear(); // just remove features without modification of DS - updateHistory(ModelAPI_Feature::group()); + myHistory.clear(); } void Model_Objects::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis) @@ -347,9 +381,12 @@ void Model_Objects::moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis) if (theAfterThis.get()) anAfterLab = std::dynamic_pointer_cast(theAfterThis->data())->label().Father(); + // check whether some folder refers to the moved feature by start or end: if yes, remove from it + removeFromFolder(std::list(1, theMoved)); + Handle(TDataStd_HLabelArray1) aNewArray = new TDataStd_HLabelArray1(aRefs->Lower(), aRefs->Upper()); - int aPassedMovedFrom = 0; // the prev feature location is found and passed + int aPassedMovedFrom = 0; // the previous feature location is found and passed int aPassedMovedTo = 0; // the feature is added and this location is passed if (!theAfterThis.get()) { // null means that inserted feature must be the first aNewArray->SetValue(aRefs->Lower(), aMovedLab); @@ -392,9 +429,8 @@ void Model_Objects::clearHistory(ObjectPtr theObj) { if (theObj.get()) { const std::string aGroup = theObj->groupName(); - std::map >::iterator aHIter = myHistory.find(aGroup); - if (aHIter != myHistory.end()) - myHistory.erase(aHIter); // erase from map => this means that it is not synchronized + updateHistory(aGroup); + if (theObj->groupName() == ModelAPI_Feature::group()) { // clear results group of the feature FeaturePtr aFeature = std::dynamic_pointer_cast(theObj); std::string aResultGroup = featureResultGroup(aFeature); @@ -417,6 +453,7 @@ void Model_Objects::createHistory(const std::string& theGroupID) FeaturePtr aLastFeatureInFolder; // iterate the array of references and get feature by feature from the array bool isFeature = theGroupID == ModelAPI_Feature::group(); + bool isFolder = theGroupID == ModelAPI_Folder::group(); Handle(TDataStd_ReferenceArray) aRefs; if (featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) { for(int a = aRefs->Lower(); a <= aRefs->Upper(); a++) { @@ -455,9 +492,14 @@ void Model_Objects::createHistory(const std::string& theGroupID) } else { // it may be a folder - ObjectPtr aFolder = folder(aRefs->Value(a)); + const ObjectPtr& aFolder = folder(aRefs->Value(a)); if (aFolder.get()) { - aResult.push_back(aFolder); + // store folder information for the Features group only + if (isFeature || isFolder) { + aResult.push_back(aFolder); + if (!isFolder) + aResultOutOfFolder.push_back(aFolder); + } // get the last feature in the folder AttributeReferencePtr aLastFeatAttr = @@ -474,7 +516,8 @@ void Model_Objects::createHistory(const std::string& theGroupID) // store the features placed out of any folder const std::string& anOutOfFolderGroupID = groupNameFoldering(theGroupID, true); - myHistory[anOutOfFolderGroupID] = aResultOutOfFolder; + if (!anOutOfFolderGroupID.empty()) + myHistory[anOutOfFolderGroupID] = aResultOutOfFolder; } } } @@ -487,15 +530,22 @@ void Model_Objects::updateHistory(const std::shared_ptr theObje void Model_Objects::updateHistory(const std::string theGroup) { std::map >::iterator aHIter = myHistory.find(theGroup); - if (aHIter != myHistory.end()) + if (aHIter != myHistory.end()) { myHistory.erase(aHIter); // erase from map => this means that it is not synchronized + + // erase history for the group of objects placed out of any folder + const std::string& anOutOfFolderGroupID = groupNameFoldering(theGroup, true); + if (!anOutOfFolderGroupID.empty()) + myHistory.erase(anOutOfFolderGroupID); + } } -ObjectPtr Model_Objects::folder(TDF_Label theLabel) const +const ObjectPtr& Model_Objects::folder(TDF_Label theLabel) const { if (myFolders.IsBound(theLabel)) return myFolders.Find(theLabel); - return ObjectPtr(); + static ObjectPtr anEmptyResult; + return anEmptyResult; } FeaturePtr Model_Objects::feature(TDF_Label theLabel) const @@ -511,41 +561,54 @@ ObjectPtr Model_Objects::object(TDF_Label theLabel) FeaturePtr aFeature = feature(theLabel); if (aFeature.get()) return feature(theLabel); - TDF_Label aFeatureLabel = theLabel.Father().Father(); // let's suppose it is result - aFeature = feature(aFeatureLabel); - bool isSubResult = false; - if (!aFeature.get() && aFeatureLabel.Depth() > 1) { // let's suppose this is sub-result of result + TDF_Label aFeatureLabel = theLabel; // let's suppose it is result of this feature + TDF_LabelList aSubLabs; // sub - labels from higher level to lower level of result + while(!aFeature.get() && aFeatureLabel.Depth() > 1) { + aSubLabs.Prepend(aFeatureLabel); aFeatureLabel = aFeatureLabel.Father().Father(); aFeature = feature(aFeatureLabel); - isSubResult = true; } if (aFeature.get()) { - const std::list >& aResults = aFeature->results(); - std::list >::const_iterator aRIter = aResults.cbegin(); - for (; aRIter != aResults.cend(); aRIter++) { - if (isSubResult) { - ResultCompSolidPtr aCompRes = std::dynamic_pointer_cast(*aRIter); - if (aCompRes.get()) { - int aNumSubs = aCompRes->numberOfSubs(); - for(int a = 0; a < aNumSubs; a++) { - ResultPtr aSub = aCompRes->subResult(a); - if (aSub.get()) { - std::shared_ptr aSubData = std::dynamic_pointer_cast( - aSub->data()); - if (aSubData->label().Father().IsEqual(theLabel)) - return aSub; + ResultPtr aCurrentResult; + // searching for results then sub-results label by label + for(TDF_ListIteratorOfLabelList aSubLab(aSubLabs); aSubLab.More(); aSubLab.Next()) { + if (aCurrentResult.get()) { // iterate sub-results of result + ResultBodyPtr anOwner = std::dynamic_pointer_cast(aCurrentResult); + if (!anOwner) + return ObjectPtr(); // only Body can have sub-results + int a, aNumSubs = anOwner->numberOfSubs(); + for(a = 0; a < aNumSubs; a++) { + ResultPtr aSub = anOwner->subResult(a); + if (aSub.get()) { + std::shared_ptr aSubData = std::dynamic_pointer_cast( + aSub->data()); + const TDF_Label& aSubLabVal = aSubLab.ChangeValue(); + if (aSubData->label().Father().IsEqual(aSubLabVal)) { + aCurrentResult = aSub; + break; } } } - } else { - std::shared_ptr aResData = std::dynamic_pointer_cast( - (*aRIter)->data()); - if (aResData->label().Father().IsEqual(theLabel)) - return *aRIter; + if (a == aNumSubs) // not found an appropriate sub-result of result + return ObjectPtr(); + } else { // iterate results of feature + const std::list& aResults = aFeature->results(); + std::list >::const_iterator aRIter = aResults.cbegin(); + for(; aRIter != aResults.cend(); aRIter++) { + std::shared_ptr aResData = + std::dynamic_pointer_cast((*aRIter)->data()); + if (aResData->label().Father().IsEqual(aSubLab.ChangeValue())) { + aCurrentResult = *aRIter; + break; + } + } + if (aRIter == aResults.cend()) // not found an appropriate result of feature + return ObjectPtr(); } } + return aCurrentResult; } - return FeaturePtr(); // not found + return ObjectPtr(); // not found } ObjectPtr Model_Objects::object(const std::string& theGroupID, @@ -554,9 +617,12 @@ ObjectPtr Model_Objects::object(const std::string& theGroupID, { if (theIndex == -1) return ObjectPtr(); + createHistory(theGroupID); const std::string& aGroupID = groupNameFoldering(theGroupID, theAllowFolder); - createHistory(aGroupID); - return myHistory[aGroupID][theIndex]; + const std::vector& aVec = myHistory[theGroupID]; + //if (aVec.size() <= theIndex) + // return aVec[aVec.size() - 1]; // too high index requested (to avoid crash in #2360) + return aGroupID.empty() ? myHistory[theGroupID][theIndex] : myHistory[aGroupID][theIndex]; } std::shared_ptr Model_Objects::objectByName( @@ -565,33 +631,23 @@ std::shared_ptr Model_Objects::objectByName( createHistory(theGroupID); if (theGroupID == ModelAPI_Feature::group()) { // searching among features (in history or not) std::list > allObjs = allFeatures(); - std::list >::iterator anObjIter = allObjs.begin(); - for(; anObjIter != allObjs.end(); anObjIter++) { + // from the end to find the latest result with such name + std::list >::reverse_iterator anObjIter = allObjs.rbegin(); + for(; anObjIter != allObjs.rend(); anObjIter++) { if ((*anObjIter)->data()->name() == theName) return *anObjIter; } } else { // searching among results (concealed or not) std::list > allObjs = allFeatures(); - std::list >::iterator anObjIter = allObjs.begin(); - for(; anObjIter != allObjs.end(); anObjIter++) { - const std::list >& aResults = (*anObjIter)->results(); - std::list >::const_iterator aRIter = aResults.cbegin(); - for (; aRIter != aResults.cend(); aRIter++) { - if (aRIter->get() && (*aRIter)->groupName() == theGroupID) { - if ((*aRIter)->data()->name() == theName) - return *aRIter; - ResultCompSolidPtr aCompRes = - std::dynamic_pointer_cast(*aRIter); - if (aCompRes.get()) { - int aNumSubs = aCompRes->numberOfSubs(); - for(int a = 0; a < aNumSubs; a++) { - ResultPtr aSub = aCompRes->subResult(a); - if (aSub.get() && aSub->groupName() == theGroupID) { - if (aSub->data()->name() == theName) - return aSub; - } - } - } + // from the end to find the latest result with such name + std::list >::reverse_iterator anObjIter = allObjs.rbegin(); + for(; anObjIter != allObjs.rend(); anObjIter++) { + std::list allRes; + ModelAPI_Tools::allResults(*anObjIter, allRes); + for(std::list::iterator aRes = allRes.begin(); aRes != allRes.end(); aRes++) { + if (aRes->get() && (*aRes)->groupName() == theGroupID) { + if ((*aRes)->data()->name() == theName) + return *aRes; } } } @@ -600,10 +656,19 @@ std::shared_ptr Model_Objects::objectByName( return ObjectPtr(); } -const int Model_Objects::index(std::shared_ptr theObject) +const int Model_Objects::index(std::shared_ptr theObject, + const bool theAllowFolder) { std::string aGroup = theObject->groupName(); + // treat folder as feature + if (aGroup == ModelAPI_Folder::group()) + aGroup = ModelAPI_Feature::group(); createHistory(aGroup); + + // get the group of features out of folder (if enabled) + if (theAllowFolder && !groupNameFoldering(aGroup, theAllowFolder).empty()) + aGroup = groupNameFoldering(aGroup, theAllowFolder); + std::vector& allObjs = myHistory[aGroup]; std::vector::iterator anObjIter = allObjs.begin(); // iterate to search object for(int anIndex = 0; anObjIter != allObjs.end(); anObjIter++, anIndex++) { @@ -616,11 +681,26 @@ const int Model_Objects::index(std::shared_ptr theObject) int Model_Objects::size(const std::string& theGroupID, const bool theAllowFolder) { + createHistory(theGroupID); const std::string& aGroupID = groupNameFoldering(theGroupID, theAllowFolder); - createHistory(aGroupID); - return int(myHistory[aGroupID].size()); + return aGroupID.empty() ? int(myHistory[theGroupID].size()) : int(myHistory[aGroupID].size()); } +std::shared_ptr Model_Objects::parent( + const std::shared_ptr theChild) +{ + if (theChild.get()) { + std::shared_ptr aData = std::dynamic_pointer_cast(theChild->data()); + TDF_Label aLab = aData->label(); + if (!aLab.IsNull() && aLab.Depth() > 2) { + ObjectPtr anObj = object(aLab.Father().Father().Father()); + return anObj; + } + } + return ObjectPtr(); +} + + void Model_Objects::allResults(const std::string& theGroupID, std::list& theResults) { // iterate the array of references and get feature by feature from the array @@ -665,31 +745,17 @@ void Model_Objects::setUniqueName(FeaturePtr theFeature) // first count all features of such kind to start with index = count + 1 int aNumObjects = -1; // this feature is already in this map NCollection_DataMap::Iterator aFIter(myFeatures); + std::set allNames; for (; aFIter.More(); aFIter.Next()) { if (aFIter.Value()->getKind() == theFeature->getKind()) aNumObjects++; + allNames.insert(aFIter.Value()->data()->name()); } // generate candidate name aName = composeName(theFeature->getKind(), aNumObjects + 1); // check this is unique, if not, increase index by 1 - for (aFIter.Initialize(myFeatures); aFIter.More();) { - FeaturePtr aFeature = aFIter.Value(); - bool isSameName = aFeature->data()->name() == aName; - if (!isSameName) { // check also results to avoid same results names (actual for Parts) - const std::list >& aResults = aFeature->results(); - std::list >::const_iterator aRIter = aResults.begin(); - for (; aRIter != aResults.cend(); aRIter++) { - isSameName = (*aRIter)->data()->name() == aName; - } - } - - if (isSameName) { - aNumObjects++; - aName = composeName(theFeature->getKind(), aNumObjects + 1); - // reinitialize iterator to make sure a new name is unique - aFIter.Initialize(myFeatures); - } else - aFIter.Next(); + for(aNumObjects++; allNames.find(aName) != allNames.end(); aNumObjects++) { + aName = composeName(theFeature->getKind(), aNumObjects + 1); } theFeature->data()->setName(aName); } @@ -706,7 +772,7 @@ void Model_Objects::setUniqueName(FolderPtr theFolder) NCollection_DataMap::Iterator anIt(myFolders); while (anIt.More()) { if (anIt.Value()->data()->name() == aName) { - aName = composeName(ModelAPI_Folder::ID(), aNbFolders); + aName = composeName(ModelAPI_Folder::ID(), ++aNbFolders); // reinitialize iterator to make sure a new name is unique anIt.Initialize(myFolders); } else @@ -734,15 +800,6 @@ void Model_Objects::initData(ObjectPtr theObj, TDF_Label theLab, const int theTa theObj->initAttributes(); } -std::shared_ptr Model_Objects::featureById(const int theId) -{ - if (theId > 0) { - TDF_Label aLab = featuresLabel().FindChild(theId, Standard_False); - return feature(aLab); - } - return std::shared_ptr(); // not found -} - void Model_Objects::synchronizeFeatures( const TDF_LabelList& theUpdated, const bool theUpdateReferences, const bool theExecuteFeatures, const bool theOpen, const bool theFlush) @@ -767,30 +824,40 @@ void Model_Objects::synchronizeFeatures( TDF_Label& aFeatureLab = anUpdatedIter.Value(); while(aFeatureLab.Depth() > 3) aFeatureLab = aFeatureLab.Father(); - if (myFeatures.IsBound(aFeatureLab)) + if (myFeatures.IsBound(aFeatureLab) || myFolders.IsBound(aFeatureLab)) anUpdatedMap.Add(aFeatureLab); } // update all objects by checking are they on labels or not - std::set aNewFeatures, aKeptFeatures; + std::set aNewFeatures, aKeptFeatures; TDF_ChildIDIterator aLabIter(featuresLabel(), TDataStd_Comment::GetID()); for (; aLabIter.More(); aLabIter.Next()) { TDF_Label aFeatureLabel = aLabIter.Value()->Label(); - FeaturePtr aFeature; - if (!myFeatures.IsBound(aFeatureLabel)) { // a new feature is inserted + if (!myFeatures.IsBound(aFeatureLabel) && !myFolders.IsBound(aFeatureLabel)) { + // a new feature or folder is inserted + + std::string aFeatureID = TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast( + aLabIter.Value())->Get()).ToCString(); + bool isFolder = aFeatureID == ModelAPI_Folder::ID(); + + std::shared_ptr aSession = + std::dynamic_pointer_cast(ModelAPI_Session::get()); + // create a feature - aFeature = std::dynamic_pointer_cast(ModelAPI_Session::get())->createFeature( - TCollection_AsciiString(Handle(TDataStd_Comment)::DownCast(aLabIter.Value())->Get()) - .ToCString(), anOwner); + ObjectPtr aFeature = isFolder ? ObjectPtr(new ModelAPI_Folder) + : ObjectPtr(aSession->createFeature(aFeatureID, anOwner)); if (!aFeature.get()) { - // somethig is wrong, most probably, the opened document has invalid structure + // something is wrong, most probably, the opened document has invalid structure Events_InfoMessage("Model_Objects", "Invalid type of object in the document").send(); aLabIter.Value()->Label().ForgetAllAttributes(); continue; } aFeature->init(); // this must be before "setData" to redo the sketch line correctly - myFeatures.Bind(aFeatureLabel, aFeature); + if (isFolder) + myFolders.Bind(aFeatureLabel, aFeature); + else + myFeatures.Bind(aFeatureLabel, std::dynamic_pointer_cast(aFeature)); aNewFeatures.insert(aFeature); initData(aFeature, aFeatureLabel, TAG_FEATURE_ARGUMENTS); updateHistory(aFeature); @@ -798,18 +865,44 @@ void Model_Objects::synchronizeFeatures( // event: model is updated ModelAPI_EventCreator::get()->sendUpdated(aFeature, aCreateEvent); } else { // nothing is changed, both iterators are incremented - aFeature = myFeatures.Find(aFeatureLabel); - aKeptFeatures.insert(aFeature); + ObjectPtr anObject; + FeaturePtr aFeature; + if (myFeatures.Find(aFeatureLabel, aFeature)) { + aKeptFeatures.insert(aFeature); + anObject = aFeature; + } else + if (myFolders.Find(aFeatureLabel, anObject)) + aKeptFeatures.insert(anObject); + if (anUpdatedMap.Contains(aFeatureLabel)) { if (!theOpen) { // on abort/undo/redo reinitialize attributes if something is changed - std::list > anAttrs = - aFeature->data()->attributes(""); - std::list >::iterator anAttr = anAttrs.begin(); - for(; anAttr != anAttrs.end(); anAttr++) - (*anAttr)->reinit(); + FiltersFeaturePtr aFilter = std::dynamic_pointer_cast(anObject); + if (aFilter.get()) { // for filters attributes may be added/removed on undo/redo + std::dynamic_pointer_cast(aFilter->data())->clearAttributes(); + aFilter->initAttributes(); + } else { + std::list > anAttrs = + anObject->data()->attributes(""); + std::list >::iterator anAttr = anAttrs.begin(); + for(; anAttr != anAttrs.end(); anAttr++) + (*anAttr)->reinit(); + // if feature contains results, re-init them too + if (aFeature.get()) { + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + std::list::iterator aResIter = aResults.begin(); + for(; aResIter != aResults.end(); aResIter++) { + std::list > anAttrs = + (*aResIter)->data()->attributes(""); + std::list >::iterator anAttr = anAttrs.begin(); + for(; anAttr != anAttrs.end(); anAttr++) + (*anAttr)->reinit(); + } + } + } } - ModelAPI_EventCreator::get()->sendUpdated(aFeature, anUpdateEvent); - if (aFeature->getKind() == "Parameter") { + ModelAPI_EventCreator::get()->sendUpdated(anObject, anUpdateEvent); + if (aFeature && aFeature->getKind() == "Parameter") { // if parameters are changed, update the results (issue 937) const std::list >& aResults = aFeature->results(); std::list >::const_iterator aRIter = aResults.begin(); @@ -848,13 +941,33 @@ void Model_Objects::synchronizeFeatures( } else aFIter.Next(); } + // verify folders are checked: if not => is was removed + for (NCollection_DataMap::Iterator aFldIt(myFolders); + aFldIt.More(); aFldIt.Next()) { + ObjectPtr aCurObj = aFldIt.Value(); + if (aKeptFeatures.find(aCurObj) == aKeptFeatures.end() && + aNewFeatures.find(aCurObj) == aNewFeatures.end()) { + ModelAPI_EventCreator::get()->sendDeleted(myDoc, ModelAPI_Folder::group()); + // results of this feature must be redisplayed (hided) + // redisplay also removed feature (used for sketch and AISObject) + ModelAPI_EventCreator::get()->sendUpdated(aCurObj, aRedispEvent); + updateHistory(aCurObj); + aCurObj->erase(); + + // unbind after the "erase" call: on abort sketch + // is removes sub-objects that corrupts aFIter + myFolders.UnBind(aFldIt.Key()); + // reinitialize iterator because unbind may corrupt the previous order in the map + aFldIt.Initialize(myFolders); + } + } if (theUpdateReferences) { synchronizeBackRefs(); } // update results of the features (after features created because // they may be connected, like sketch and sub elements) - // After synchronisation of back references because sketch + // After synchronization of back references because sketch // must be set in sub-elements before "execute" by updateResults std::set aProcessed; // composites must be updated after their subs (issue 360) TDF_ChildIDIterator aLabIter2(featuresLabel(), TDataStd_Comment::GetID()); @@ -875,8 +988,8 @@ void Model_Objects::synchronizeFeatures( myHistory.clear(); } - if (theExecuteFeatures) - anOwner->executeFeatures() = false; + if (!theExecuteFeatures) + anOwner->setExecuteFeatures(false); aLoop->activateFlushes(isActive); if (theFlush) { @@ -889,23 +1002,32 @@ void Model_Objects::synchronizeFeatures( aLoop->flush(aRedispEvent); aLoop->flush(aToHideEvent); } - if (theExecuteFeatures) - anOwner->executeFeatures() = true; + if (!theExecuteFeatures) + anOwner->setExecuteFeatures(true); } -/// synchronises back references for the given object basing on the collected data +/// synchronizes back references for the given object basing on the collected data void Model_Objects::synchronizeBackRefsForObject(const std::set& theNewRefs, ObjectPtr theObject) { if (!theObject.get() || !theObject->data()->isValid()) return; // invalid std::shared_ptr aData = std::dynamic_pointer_cast(theObject->data()); - // iterate new list to compare with curent + // iterate new list to compare with current std::set::iterator aNewIter = theNewRefs.begin(); for(; aNewIter != theNewRefs.end(); aNewIter++) { + // for the Model_AttributeRefList erase cash (issue #2819) + std::shared_ptr aRefList = + std::dynamic_pointer_cast(*aNewIter); + if (aRefList) + aRefList->eraseHash(); + if (aData->refsToMe().find(*aNewIter) == aData->refsToMe().end()) { FeaturePtr aRefFeat = std::dynamic_pointer_cast((*aNewIter)->owner()); - aData->addBackReference(aRefFeat, (*aNewIter)->id()); + if (aRefFeat) + aData->addBackReference(aRefFeat, (*aNewIter)->id()); + else // add back reference to a folder + aData->addBackReference((*aNewIter)->owner(), (*aNewIter)->id()); } } if (theNewRefs.size() != aData->refsToMe().size()) { // some back ref must be removed @@ -941,38 +1063,77 @@ void Model_Objects::synchronizeBackRefsForObject(const std::set& t } else aCurrentIter++; } } + // for the last feature in the folder, check if it is a sub-feature, + // then refer the folder to a top-level parent composite feature + const std::set& aRefs = aData->refsToMe(); + std::set::iterator anIt = aRefs.begin(); + for (; anIt != aRefs.end(); ++anIt) + if ((*anIt)->id() == ModelAPI_Folder::LAST_FEATURE_ID()) + break; + if (anIt != aRefs.end()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + if (aFeature) { + CompositeFeaturePtr aParent; + CompositeFeaturePtr aGrandParent = ModelAPI_Tools::compositeOwner(aFeature); + do { + aParent = aGrandParent; + if (aGrandParent) + aGrandParent = ModelAPI_Tools::compositeOwner(aParent); + } while (aGrandParent.get()); + if (aParent) { + ObjectPtr aFolder = (*anIt)->owner(); + // remove reference from the current feature + aData->removeBackReference(aFolder, ModelAPI_Folder::LAST_FEATURE_ID()); + // set reference to a top-level parent + aFolder->data()->reference(ModelAPI_Folder::LAST_FEATURE_ID())->setValue(aParent); + std::shared_ptr aParentData = + std::dynamic_pointer_cast(aParent->data()); + aParentData->addBackReference(aFolder, ModelAPI_Folder::LAST_FEATURE_ID()); + } + } + } aData->updateConcealmentFlag(); } +static void collectReferences(std::shared_ptr theData, + std::map >& theRefs) +{ + if (theData.get()) { + std::list > > aRefs; + theData->referencesToObjects(aRefs); + std::list > >::iterator aRefsIt = aRefs.begin(); + for(; aRefsIt != aRefs.end(); aRefsIt++) { + std::list::iterator aRefTo = aRefsIt->second.begin(); + for(; aRefTo != aRefsIt->second.end(); aRefTo++) { + if (*aRefTo) { + std::map >::iterator aFound = theRefs.find(*aRefTo); + if (aFound == theRefs.end()) { + theRefs[*aRefTo] = std::set(); + aFound = theRefs.find(*aRefTo); + } + aFound->second.insert(theData->attribute(aRefsIt->first)); + } + } + } + } +} + void Model_Objects::synchronizeBackRefs() { // collect all back references in the separated container: to update everything at once, - // without additional Concealment switchin on and off: only the final modification + // without additional Concealment switching on and off: only the final modification - // referenced (slave) objects to referencing attirbutes + // referenced (slave) objects to referencing attributes std::map > allRefs; NCollection_DataMap::Iterator aFeatures(myFeatures); for(; aFeatures.More(); aFeatures.Next()) { FeaturePtr aFeature = aFeatures.Value(); - std::shared_ptr aFData = std::dynamic_pointer_cast(aFeature->data()); - if (aFData.get()) { - std::list > > aRefs; - aFData->referencesToObjects(aRefs); - std::list > >::iterator aRefsIt = aRefs.begin(); - for(; aRefsIt != aRefs.end(); aRefsIt++) { - std::list::iterator aRefTo = aRefsIt->second.begin(); - for(; aRefTo != aRefsIt->second.end(); aRefTo++) { - if (*aRefTo) { - std::map >::iterator aFound = allRefs.find(*aRefTo); - if (aFound == allRefs.end()) { - allRefs[*aRefTo] = std::set(); - aFound = allRefs.find(*aRefTo); - } - aFound->second.insert(aFeature->data()->attribute(aRefsIt->first)); - } - } - } - } + collectReferences(aFeature->data(), allRefs); + } + NCollection_DataMap::Iterator aFolders(myFolders); + for(; aFolders.More(); aFolders.Next()) { + ObjectPtr aFolder = aFolders.Value(); + collectReferences(aFolder->data(), allRefs); } // second iteration: just compare back-references with existing in features and results for(aFeatures.Initialize(myFeatures); aFeatures.More(); aFeatures.Next()) { @@ -1003,7 +1164,7 @@ void Model_Objects::synchronizeBackRefs() FeaturePtr aFeature = aFeatures.Value(); std::list aResults; ModelAPI_Tools::allResults(aFeature, aResults); - // update the concealment status for disply in isConcealed of ResultBody + // update the concealment status for display in isConcealed of ResultBody std::list::iterator aRIter = aResults.begin(); for(; aRIter != aResults.cend(); aRIter++) { (*aRIter)->isConcealed(); @@ -1030,30 +1191,36 @@ bool Model_Objects::hasCustomName(DataPtr theFeatureData, int theResultIndex, std::string& theParentName) const { - ResultCompSolidPtr aCompSolidRes = - std::dynamic_pointer_cast(theFeatureData->owner()); - if (aCompSolidRes) { - FeaturePtr anOwner = ModelAPI_Feature::feature(theResult->data()->owner()); + ResultBodyPtr aBodyRes = std::dynamic_pointer_cast(theFeatureData->owner()); + if (aBodyRes) { + // only for top-results (works for the cases when results are not yet added to the feature) + FeaturePtr anOwner = ModelAPI_Feature::feature(theResult); // names of sub-solids in CompSolid should be default (for example, // result of boolean operation 'Boolean_1' is a CompSolid which is renamed to 'MyBOOL', // however, sub-elements of 'MyBOOL' should be named 'Boolean_1_1', 'Boolean_1_2' etc.) - std::ostringstream aDefaultName; - aDefaultName << anOwner->name(); - // compute default name of CompSolid (name of feature + index of CompSolid's result) - int aCompSolidResultIndex = 0; - const std::list& aResults = anOwner->results(); - for (std::list::const_iterator anIt = aResults.begin(); - anIt != aResults.end(); ++anIt, ++aCompSolidResultIndex) - if (aCompSolidRes == *anIt) - break; - aDefaultName << "_" << (aCompSolidResultIndex + 1); - theParentName = aDefaultName.str(); + if (std::dynamic_pointer_cast(aBodyRes->data())->label().Depth() == 6) { + std::ostringstream aDefaultName; + // compute default name of CompSolid (name of feature + index of CompSolid's result) + int aBodyResultIndex = 0; + const std::list& aResults = anOwner->results(); + std::list::const_iterator anIt = aResults.begin(); + for (; anIt != aResults.end(); ++anIt, ++aBodyResultIndex) + if (aBodyRes == *anIt) + break; + aDefaultName << anOwner->name(); + aDefaultName << "_" << (aBodyResultIndex + 1); + theParentName = aDefaultName.str(); + } else { // just name of the parent result if it is deeper than just a sub-result + theParentName = aBodyRes->data()->name(); + } return false; } - theParentName = ModelAPI_Tools::getDefaultName(theResult, theResultIndex); - return true; + std::pair aName = ModelAPI_Tools::getDefaultName(theResult); + if (aName.second) + theParentName = aName.first; + return aName.second; } void Model_Objects::storeResult(std::shared_ptr theFeatureData, @@ -1066,7 +1233,11 @@ void Model_Objects::storeResult(std::shared_ptr theFeatureData, if (theResult->data()->name().empty()) { // if was not initialized, generate event and set a name std::string aNewName = theFeatureData->name(); - if (!hasCustomName(theFeatureData, theResult, theResultIndex, aNewName)) { + if (hasCustomName(theFeatureData, theResult, theResultIndex, aNewName)) { + // if the name of result is user-defined, then, at first time, assign name of the result + // by empty string to be sure that corresponding flag in the data model is set + theResult->data()->setName(""); + } else { std::stringstream aName; aName << aNewName; // if there are several results (issue #899: any number of result), @@ -1100,27 +1271,14 @@ std::shared_ptr Model_Objects::createBody( const std::shared_ptr& theFeatureData, const int theIndex) { TDF_Label aLab = resultLabel(theFeatureData, theIndex); - // for feature create compsolid, but for result sub create body: - // only one level of recursion is supported now - ResultPtr aResultOwner = std::dynamic_pointer_cast(theFeatureData->owner()); - ObjectPtr anOldObject; - if (aResultOwner.get()) { - TDataStd_Comment::Set(aLab, ModelAPI_ResultBody::group().c_str()); - } else { // in compsolid (higher level result) old object probably may be found - TDataStd_Comment::Set(aLab, ModelAPI_ResultCompSolid::group().c_str()); - anOldObject = object(aLab); - } + TDataStd_Comment::Set(aLab, ModelAPI_ResultBody::group().c_str()); + ObjectPtr anOldObject = object(aLab); std::shared_ptr aResult; if (anOldObject.get()) { aResult = std::dynamic_pointer_cast(anOldObject); } if (!aResult.get()) { - // create compsolid anyway; if it is compsolid, it will create sub-bodies internally - if (aResultOwner.get()) { - aResult = std::shared_ptr(new Model_ResultBody); - } else { - aResult = std::shared_ptr(new Model_ResultCompSolid); - } + aResult = std::shared_ptr(new Model_ResultBody); storeResult(theFeatureData, aResult, theIndex); } return aResult; @@ -1219,7 +1377,8 @@ std::shared_ptr Model_Objects::createFolder( std::shared_ptr aPrevData = std::dynamic_pointer_cast(theBeforeThis->data()); if (aPrevData.get()) { - aPrevFeatureLab = nextLabel(aPrevData->label().Father(), true); + int anIndex = kUNDEFINED_FEATURE_INDEX; + aPrevFeatureLab = nextLabel(aPrevData->label().Father(), anIndex, true); } } else { // find the label of the last feature Handle(TDataStd_ReferenceArray) aRefs; @@ -1233,6 +1392,7 @@ std::shared_ptr Model_Objects::createFolder( myFolders.Bind(aFolderLab, aFolder); // must be before the event sending: for OB the feature is already added updateHistory(ModelAPI_Folder::group()); + updateHistory(ModelAPI_Feature::group()); // must be after binding to the map because of "Box" macro feature that // creates other features in "initData" @@ -1245,14 +1405,409 @@ std::shared_ptr Model_Objects::createFolder( return aFolder; } +void Model_Objects::removeFolder(std::shared_ptr theFolder) +{ + std::shared_ptr aData = std::static_pointer_cast(theFolder->data()); + if (!aData.get() || !aData->isValid()) + return; + + // this must be before erase since theFolder erasing removes all information about it + clearHistory(theFolder); + // erase fields + theFolder->erase(); + + TDF_Label aFolderLabel = aData->label().Father(); + if (myFolders.IsBound(aFolderLabel)) + myFolders.UnBind(aFolderLabel); + + static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY); + ModelAPI_EventCreator::get()->sendUpdated(theFolder, EVENT_DISP); + // erase all attributes under the label of feature + aFolderLabel.ForgetAllAttributes(); + // remove it from the references array + RemoveFromRefArray(featuresLabel(), aFolderLabel); + // event: feature is deleted + ModelAPI_EventCreator::get()->sendDeleted(theFolder->document(), ModelAPI_Folder::group()); + updateHistory(ModelAPI_Folder::group()); + updateHistory(ModelAPI_Feature::group()); +} + +// Returns one of the limiting features of the list +static FeaturePtr limitingFeature(std::list& theFeatures, const bool isLast) +{ + FeaturePtr aFeature; + if (isLast) { + aFeature = theFeatures.back(); + theFeatures.pop_back(); + } else { + aFeature = theFeatures.front(); + theFeatures.pop_front(); + } + return aFeature; +} + +// Verify the feature is sub-element in composite feature or it is not used in the history +static bool isSkippedFeature(FeaturePtr theFeature) +{ + bool isSub = ModelAPI_Tools::compositeOwner(theFeature).get() != NULL; + return isSub || (theFeature && !theFeature->isInHistory()); +} + +std::shared_ptr Model_Objects::findFolder( + const std::list >& theFeatures, + const bool theBelow) +{ + if (theFeatures.empty()) + return FolderPtr(); // nothing to move + + TDF_Label aFeaturesLab = featuresLabel(); + Handle(TDataStd_ReferenceArray) aRefs; + if (!aFeaturesLab.FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) + return FolderPtr(); // no reference array (something is wrong) + + std::list > aFeatures = theFeatures; + std::shared_ptr aLimitingFeature = limitingFeature(aFeatures, theBelow); + + std::shared_ptr aData = + std::static_pointer_cast(aLimitingFeature->data()); + if (!aData || !aData->isValid()) + return FolderPtr(); // invalid feature + + // label of the first feature in the list for fast searching + TDF_Label aFirstFeatureLabel = aData->label().Father(); + + // find a folder above the features and + // check the given features represent a sequential list of objects following the folder + FolderPtr aFoundFolder; + TDF_Label aLastFeatureInFolder; + int aRefIndex = aRefs->Lower(); + for(; aRefIndex <= aRefs->Upper(); ++aRefIndex) { // iterate all existing features + TDF_Label aCurLabel = aRefs->Value(aRefIndex); + if (IsEqual(aCurLabel, aFirstFeatureLabel)) + break; // no need to continue searching + + // searching the folder below, just continue to search last feature from the list + if (theBelow) + continue; + + // if feature is in sub-component, skip it + FeaturePtr aCurFeature = feature(aCurLabel); + if (isSkippedFeature(aCurFeature)) + continue; + + if (!aLastFeatureInFolder.IsNull()) { + if (IsEqual(aCurLabel, aLastFeatureInFolder)) + aLastFeatureInFolder.Nullify(); // the last feature in the folder is achieved + continue; + } + + const ObjectPtr& aFolderObj = folder(aCurLabel); + if (aFolderObj.get()) { + aFoundFolder = std::dynamic_pointer_cast(aFolderObj); + AttributeReferencePtr aLastFeatAttr = + aFoundFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID()); + if (aLastFeatAttr) { + // setup iterating inside a folder to find last feature + ObjectPtr aLastFeature = aLastFeatAttr->value(); + if (aLastFeature) { + aData = std::static_pointer_cast(aLastFeature->data()); + if (aData && aData->isValid()) + aLastFeatureInFolder = aData->label().Father(); + } + } + } + } + + if (theBelow && aRefIndex < aRefs->Upper()) { + TDF_Label aLabel; + // skip following features which are sub-components or not in history + for (int anIndex = aRefIndex + 1; anIndex <= aRefs->Upper(); ++anIndex) { + aLabel = aRefs->Value(anIndex); + FeaturePtr aCurFeature = feature(aLabel); + if (!isSkippedFeature(aCurFeature)) + break; + } + // check the next object is a folder + aFoundFolder = std::dynamic_pointer_cast(folder(aLabel)); + } + + if (!aLastFeatureInFolder.IsNull() || // the last feature of the folder above is not found + !aFoundFolder) + return FolderPtr(); + + // check the given features are sequential list + int aStep = theBelow ? -1 : 1; + for (aRefIndex += aStep; + !aFeatures.empty() && aRefIndex >= aRefs->Lower() && aRefIndex <= aRefs->Upper(); + aRefIndex += aStep) { + TDF_Label aCurLabel = aRefs->Value(aRefIndex); + // if feature is in sub-component, skip it + FeaturePtr aCurFeature = feature(aCurLabel); + if (isSkippedFeature(aCurFeature)) + continue; + + aLimitingFeature = limitingFeature(aFeatures, theBelow); + if (!aCurFeature->data()->isEqual(aLimitingFeature->data())) + return FolderPtr(); // not a sequential list + } + + return aFoundFolder; +} + +bool Model_Objects::moveToFolder( + const std::list >& theFeatures, + const std::shared_ptr& theFolder) +{ + if (theFeatures.empty() || !theFolder) + return false; + + // labels for the folder and last feature in the list + TDF_Label aFolderLabel, aLastFeatureLabel; + std::shared_ptr aData = + std::static_pointer_cast(theFolder->data()); + if (aData && aData->isValid()) + aFolderLabel = aData->label().Father(); + aData = std::static_pointer_cast(theFeatures.back()->data()); + if (aData && aData->isValid()) + aLastFeatureLabel = aData->label().Father(); + + if (aFolderLabel.IsNull() || aLastFeatureLabel.IsNull()) + return false; + + AttributeReferencePtr aFirstFeatAttr = + theFolder->reference(ModelAPI_Folder::FIRST_FEATURE_ID()); + AttributeReferencePtr aLastFeatAttr = + theFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID()); + bool initFirstAttr = !aFirstFeatAttr->value().get(); + bool initLastAttr = !aLastFeatAttr->value().get(); + + // check the folder is below the list of features + bool isFolderBelow = false; + TDF_Label aFeaturesLab = featuresLabel(); + Handle(TDataStd_ReferenceArray) aRefs; + if (!aFeaturesLab.FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) + return false; // no reference array (something is wrong) + for (int aRefIndex = aRefs->Lower(); aRefIndex <= aRefs->Upper(); ++aRefIndex) { + TDF_Label aCurLabel = aRefs->Value(aRefIndex); + if (aCurLabel == aFolderLabel) + break; // folder is above the features + else if (aCurLabel == aLastFeatureLabel) { + isFolderBelow = true; + break; + } + } + + if (isFolderBelow) { + aData = std::static_pointer_cast(theFeatures.front()->data()); + if (!aData || !aData->isValid()) + return false; + TDF_Label aPrevFeatureLabel = aData->label().Father(); + // label of the feature before the first feature in the list + for (int aRefIndex = aRefs->Lower(); aRefIndex <= aRefs->Upper(); ++aRefIndex) + if (aPrevFeatureLabel == aRefs->Value(aRefIndex)) { + if (aRefIndex == aRefs->Lower()) + aPrevFeatureLabel.Nullify(); + else + aPrevFeatureLabel = aRefs->Value(aRefIndex - 1); + break; + } + + // move the folder in the list of references before the first feature + RemoveFromRefArray(aFeaturesLab, aFolderLabel); + AddToRefArray(aFeaturesLab, aFolderLabel, aPrevFeatureLabel); + // update first feature of the folder + initFirstAttr = true; + } else { + // update last feature of the folder + initLastAttr = true; + } + + if (initFirstAttr) + aFirstFeatAttr->setValue(theFeatures.front()); + if (initLastAttr) + aLastFeatAttr->setValue(theFeatures.back()); + + updateHistory(ModelAPI_Feature::group()); + return true; +} + +static FolderPtr isExtractionCorrect(const FolderPtr& theFirstFeatureFolder, + const FolderPtr& theLastFeatureFolder, + bool& isExtractBefore) +{ + if (theFirstFeatureFolder.get()) { + if (theLastFeatureFolder.get()) + return theFirstFeatureFolder == theLastFeatureFolder ? theFirstFeatureFolder : FolderPtr(); + else + isExtractBefore = true; + return theFirstFeatureFolder; + } else if (theLastFeatureFolder.get()) { + isExtractBefore = false; + return theLastFeatureFolder; + } + // no folder found + return FolderPtr(); +} + +bool Model_Objects::removeFromFolder( + const std::list >& theFeatures, + const bool theBefore) +{ + if (theFeatures.empty()) + return false; + + FolderPtr aFirstFeatureFolder = + inFolder(theFeatures.front(), ModelAPI_Folder::FIRST_FEATURE_ID()); + FolderPtr aLastFeatureFolder = + inFolder(theFeatures.back(), ModelAPI_Folder::LAST_FEATURE_ID()); + + bool isExtractBeforeFolder = theBefore; + FolderPtr aFoundFolder = + isExtractionCorrect(aFirstFeatureFolder, aLastFeatureFolder, isExtractBeforeFolder); + if (!aFoundFolder) + return false; // list of features cannot be extracted + + // references of the current folder + ObjectPtr aFolderStartFeature; + ObjectPtr aFolderEndFeature; + if (aFirstFeatureFolder != aLastFeatureFolder) { + aFolderStartFeature = aFoundFolder->reference(ModelAPI_Folder::FIRST_FEATURE_ID())->value(); + aFolderEndFeature = aFoundFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID())->value(); + } + + FeaturePtr aFeatureToFind = isExtractBeforeFolder ? theFeatures.back() : theFeatures.front(); + std::shared_ptr aData = + std::static_pointer_cast(aFeatureToFind->data()); + if (!aData || !aData->isValid()) + return false; + TDF_Label aLabelToFind = aData->label().Father(); + + // search the label in the list of references + TDF_Label aFeaturesLab = featuresLabel(); + Handle(TDataStd_ReferenceArray) aRefs; + if (!aFeaturesLab.FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) + return false; // no reference array (something is wrong) + int aRefIndex = aRefs->Lower(); + for (; aRefIndex <= aRefs->Upper(); ++aRefIndex) + if (aRefs->Value(aRefIndex) == aLabelToFind) + break; + + // update folder position + if (isExtractBeforeFolder) { + aData = std::dynamic_pointer_cast(aFoundFolder->data()); + TDF_Label aFolderLabel = aData->label().Father(); + TDF_Label aPrevFeatureLabel = aRefs->Value(aRefIndex); + // update start reference of the folder + if (aFolderStartFeature.get()) { + FeaturePtr aNewStartFeature; + do { // skip all features placed in the composite features + aPrevFeatureLabel = aRefs->Value(aRefIndex++); + aNewStartFeature = + aRefIndex <= aRefs->Upper() ? feature(aRefs->Value(aRefIndex)) : FeaturePtr(); + } while (aNewStartFeature && isSkippedFeature(aNewStartFeature)); + aFolderStartFeature = aNewStartFeature; + } + // move the folder in the list of references after the last feature from the list + RemoveFromRefArray(aFeaturesLab, aFolderLabel); + AddToRefArray(aFeaturesLab, aFolderLabel, aPrevFeatureLabel); + } else { + // update end reference of the folder + if (aFolderEndFeature.get()) { + FeaturePtr aNewEndFeature; + do { // skip all features placed in the composite features + --aRefIndex; + aNewEndFeature = + aRefIndex >= aRefs->Lower() ? feature(aRefs->Value(aRefIndex)) : FeaturePtr(); + } while (aNewEndFeature && isSkippedFeature(aNewEndFeature)); + aFolderEndFeature = aNewEndFeature; + } + } + + // update folder references + aFoundFolder->reference(ModelAPI_Folder::FIRST_FEATURE_ID())->setValue(aFolderStartFeature); + aFoundFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID())->setValue(aFolderEndFeature); + + updateHistory(ModelAPI_Feature::group()); + return true; +} + +FolderPtr Model_Objects::findContainingFolder(const FeaturePtr& theFeature, int& theIndexInFolder) +{ + // search the label in the list of references + TDF_Label aFeaturesLab = featuresLabel(); + Handle(TDataStd_ReferenceArray) aRefs; + if (!aFeaturesLab.FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) + return FolderPtr(); // no reference array (something is wrong) + + std::shared_ptr aData = + std::static_pointer_cast(theFeature->data()); + if (!aData || !aData->isValid()) + return FolderPtr(); + TDF_Label aLabelToFind = aData->label().Father(); + + theIndexInFolder = -1; + FolderPtr aFoundFolder; + TDF_Label aLastFeatureLabel; + + for (int aRefIndex = aRefs->Lower(); aRefIndex <= aRefs->Upper(); ++aRefIndex) { + TDF_Label aCurLabel = aRefs->Value(aRefIndex); + + if (aFoundFolder) + ++theIndexInFolder; + + if (aCurLabel == aLabelToFind) { // the feature is reached + if (aFoundFolder) { + if (isSkippedFeature(theFeature)) { + theIndexInFolder = -1; + return FolderPtr(); + } + // decrease the index of the feature in the folder by the number of skipped features + for (int anIndex = theIndexInFolder - 1; anIndex > 0; anIndex--) { + aCurLabel = aRefs->Value(aRefIndex - anIndex); + if (isSkippedFeature(feature(aCurLabel))) + theIndexInFolder--; + } + } + return aFoundFolder; + } + + if (!aFoundFolder) { + // if the current label refers to a folder, feel all necessary data + const ObjectPtr& aFolderObj = folder(aCurLabel); + if (aFolderObj.get()) { + aFoundFolder = std::dynamic_pointer_cast(aFolderObj); + theIndexInFolder = -1; + + AttributeReferencePtr aLastRef = + aFoundFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID()); + if (aLastRef->value()) { + aData = std::static_pointer_cast(aLastRef->value()->data()); + if (aData && aData->isValid()) + aLastFeatureLabel = aData->label().Father(); + } else // folder is empty + aFoundFolder = FolderPtr(); + } + } else if (aLastFeatureLabel == aCurLabel) { + // folder is finished, clear all stored data + theIndexInFolder = -1; + aFoundFolder = FolderPtr(); + } + } + + // folder is not found + theIndexInFolder = -1; + return FolderPtr(); +} + + std::shared_ptr Model_Objects::feature( const std::shared_ptr& theResult) { std::shared_ptr aData = std::dynamic_pointer_cast(theResult->data()); - if (aData.get()) { + if (aData.get() && aData->isValid()) { TDF_Label aFeatureLab = aData->label().Father().Father().Father(); FeaturePtr aFeature = feature(aFeatureLab); - if (!aFeature.get() && aFeatureLab.Depth() > 1) { // this may be sub-result of result + while(!aFeature.get() && aFeatureLab.Depth() > 1) { // this may be sub-result of result aFeatureLab = aFeatureLab.Father().Father(); aFeature = feature(aFeatureLab); } @@ -1293,8 +1848,10 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t } } - // for not persistent is will be done by parametric updater automatically - //if (!theFeature->isPersistentResult()) return; + // it may be on undo + if (!theFeature->data() || !theFeature->data()->isValid() || theFeature->isDisabled()) + return; + // check the existing results and remove them if there is nothing on the label std::list::const_iterator aResIter = theFeature->results().cbegin(); while(aResIter != theFeature->results().cend()) { @@ -1311,9 +1868,6 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t } aResIter++; } - // it may be on undo - if (!theFeature->data() || !theFeature->data()->isValid() || theFeature->isDisabled()) - return; // check that results are presented on all labels int aResSize = int(theFeature->results().size()); TDF_ChildIterator aLabIter(resultLabel(theFeature->data(), 0).Father()); @@ -1325,21 +1879,29 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t TDF_Label anArgLab = aLabIter.Value(); Handle(TDataStd_Comment) aGroup; if (anArgLab.FindAttribute(TDataStd_Comment::GetID(), aGroup)) { - if (aGroup->Get() == ModelAPI_ResultBody::group().c_str() || - aGroup->Get() == ModelAPI_ResultCompSolid::group().c_str()) { + if (aGroup->Get() == ModelAPI_ResultBody::group().c_str()) { aNewBody = createBody(theFeature->data(), aResIndex); } else if (aGroup->Get() == ModelAPI_ResultPart::group().c_str()) { - std::shared_ptr aNewP = createPart(theFeature->data(), aResIndex); - theFeature->setResult(aNewP, aResIndex); - if (!aNewP->partDoc().get()) - // create the part result: it is better to restore the previous result if it is possible - theFeature->execute(); + if (aResIndex <= theFeature->results().size()) { // to avoid crash if previous execute + // for index = 0 erases result + std::shared_ptr aNewP = createPart(theFeature->data(), aResIndex); + theFeature->setResult(aNewP, aResIndex); + if (!aNewP->partDoc().get()) + // create the part result: it is better to restore the previous result if possible + theFeature->execute(); + } } else if (aGroup->Get() == ModelAPI_ResultConstruction::group().c_str()) { - theFeature->execute(); // construction shapes are needed for sketch solver + ResultConstructionPtr aConstr = createConstruction(theFeature->data(), aResIndex); + if (!aConstr->updateShape()) + theFeature->execute(); // not stored shape in the data structure, execute to have it + else + theFeature->setResult(aConstr, aResIndex); // result is ready without execution } else if (aGroup->Get() == ModelAPI_ResultGroup::group().c_str()) { aNewBody = createGroup(theFeature->data(), aResIndex); } else if (aGroup->Get() == ModelAPI_ResultField::group().c_str()) { - aNewBody = createField(theFeature->data(), aResIndex); + ResultFieldPtr aField = createField(theFeature->data(), aResIndex); + aField->updateSteps(); // to refresh the internal data + aNewBody = aField; } else if (aGroup->Get() == ModelAPI_ResultParameter::group().c_str()) { theFeature->attributeChanged("expression"); // just produce a value } else { @@ -1352,6 +1914,22 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t } } } + if (aResSize > 0) { // check there exist a body that must be updated + std::list::const_iterator aRes = theFeature->results().cbegin(); + for (; aResSize && aRes != theFeature->results().cend(); aRes++, aResSize++) { + if ((*aRes)->data()->isValid()) { + if ((*aRes)->groupName() == ModelAPI_ResultBody::group()) { + ResultBodyPtr aBody = std::dynamic_pointer_cast(*aRes); + aBody->updateSubs(aBody->shape(), false); + } else if ((*aRes)->groupName() == ModelAPI_ResultConstruction::group()) { + // update the cashed myShape presented in construction + ResultConstructionPtr aConstr = + std::dynamic_pointer_cast(*aRes); + aConstr->updateShape(); + } + } + } + } } ResultPtr Model_Objects::findByName(const std::string theName) @@ -1381,31 +1959,41 @@ ResultPtr Model_Objects::findByName(const std::string theName) return aResult; } -TDF_Label Model_Objects::nextLabel(TDF_Label theCurrent, const bool theReverse) +TDF_Label Model_Objects::nextLabel(TDF_Label theCurrent, int& theIndex, const bool theReverse) { Handle(TDataStd_ReferenceArray) aRefs; if (featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) { - for(int a = aRefs->Lower(); a <= aRefs->Upper(); a++) { // iterate all existing features + int aStart = theIndex == kUNDEFINED_FEATURE_INDEX ? aRefs->Lower() : theIndex; + for(int a = aStart; a <= aRefs->Upper(); a++) { // iterate all existing features TDF_Label aCurLab = aRefs->Value(a); if (aCurLab.IsEqual(theCurrent)) { a += theReverse ? -1 : 1; - if (a >= aRefs->Lower() && a <= aRefs->Upper()) + if (a >= aRefs->Lower() && a <= aRefs->Upper()) { + theIndex = a; return aRefs->Value(a); - break; // finish iiteration: it's last feature + } + break; // finish iteration: it's last feature } } } return TDF_Label(); } -FeaturePtr Model_Objects::nextFeature(FeaturePtr theCurrent, const bool theReverse) +FeaturePtr Model_Objects::nextFeature(FeaturePtr theCurrent, int& theIndex, const bool theReverse) { std::shared_ptr aData = std::static_pointer_cast(theCurrent->data()); if (aData.get() && aData->isValid()) { TDF_Label aFeatureLabel = aData->label().Father(); - TDF_Label aNextLabel = nextLabel(aFeatureLabel, theReverse); - if (!aNextLabel.IsNull()) - return feature(aNextLabel); + do { + TDF_Label aNextLabel = nextLabel(aFeatureLabel, theIndex, theReverse); + if (aNextLabel.IsNull()) + break; // the last or something is wrong + FeaturePtr aFound = feature(aNextLabel); + if (aFound) + return aFound; // the feature is found + // if the next label is a folder, skip it + aFeatureLabel = folder(aNextLabel).get() ? aNextLabel : TDF_Label(); + } while (!aFeatureLabel.IsNull()); } return FeaturePtr(); // not found, last, or something is wrong } @@ -1423,6 +2011,12 @@ FeaturePtr Model_Objects::lastFeature() { Handle(TDataStd_ReferenceArray) aRefs; if (featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) { + // comment this because of #2674 - features are removed from array on deactivation of Part + /*FeaturePtr aLast = feature(aRefs->Value(aRefs->Upper())); + if (!aLast.get() && aRefs->Length() != 0) { // erase the invalid feature from the array + RemoveFromRefArray(featuresLabel(), aRefs->Value(aRefs->Upper())); + return lastFeature(); // try once again, after the last was removed + }*/ return feature(aRefs->Value(aRefs->Upper())); } return FeaturePtr(); // no features at all