X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Objects.cpp;h=152aaaeb84ee27a8c4211c1c3d3618dae7221f50;hb=8d04b5f4360b23cf376beff9c5e7c12d0e6a5f1e;hp=f02468717f2b816ba6396c2f185ede3d5af01d4b;hpb=f4bc7ecc3d09e89184b789ca346515c6a28e88a0;p=modules%2Fshaper.git diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp index f02468717..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 @@ -29,9 +28,12 @@ #include #include #include +#include #include #include #include +#include + #include #include @@ -41,13 +43,14 @@ #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) { @@ -149,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; @@ -310,7 +313,7 @@ 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); } } @@ -364,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) @@ -378,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); @@ -576,7 +582,8 @@ ObjectPtr Model_Objects::object(TDF_Label theLabel) if (aSub.get()) { std::shared_ptr aSubData = std::dynamic_pointer_cast( aSub->data()); - if (aSubData->label().Father().IsEqual(aSubLab.ChangeValue())) { + const TDF_Label& aSubLabVal = aSubLab.ChangeValue(); + if (aSubData->label().Father().IsEqual(aSubLabVal)) { aCurrentResult = aSub; break; } @@ -588,7 +595,8 @@ ObjectPtr Model_Objects::object(TDF_Label theLabel) 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()); + std::shared_ptr aResData = + std::dynamic_pointer_cast((*aRIter)->data()); if (aResData->label().Father().IsEqual(aSubLab.ChangeValue())) { aCurrentResult = *aRIter; break; @@ -623,15 +631,17 @@ 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++) { + // 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++) { @@ -735,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); } @@ -776,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 @@ -804,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) @@ -860,7 +847,7 @@ void Model_Objects::synchronizeFeatures( 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; @@ -889,11 +876,30 @@ void Model_Objects::synchronizeFeatures( if (anUpdatedMap.Contains(aFeatureLabel)) { if (!theOpen) { // on abort/undo/redo reinitialize attributes if something is changed - std::list > anAttrs = - anObject->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(anObject, anUpdateEvent); if (aFeature && aFeature->getKind() == "Parameter") { @@ -961,7 +967,7 @@ void Model_Objects::synchronizeFeatures( } // 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()); @@ -1000,16 +1006,22 @@ void Model_Objects::synchronizeFeatures( 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()); if (aRefFeat) @@ -1109,9 +1121,9 @@ static void collectReferences(std::shared_ptr theData, 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()) { @@ -1152,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(); @@ -1180,24 +1192,28 @@ bool Model_Objects::hasCustomName(DataPtr theFeatureData, std::string& theParentName) const { ResultBodyPtr aBodyRes = std::dynamic_pointer_cast(theFeatureData->owner()); - if (aBodyRes && std::dynamic_pointer_cast(theFeatureData)->label().Depth() < 7) { + 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 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 << "_" << (aBodyResultIndex + 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; } @@ -1361,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; @@ -1480,7 +1497,7 @@ std::shared_ptr Model_Objects::findFolder( if (!aLastFeatureInFolder.IsNull()) { if (IsEqual(aCurLabel, aLastFeatureInFolder)) - aLastFeatureInFolder.Nullify(); // the last feature in the folder is achived + aLastFeatureInFolder.Nullify(); // the last feature in the folder is achieved continue; } @@ -1787,7 +1804,7 @@ 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); while(!aFeature.get() && aFeatureLab.Depth() > 1) { // this may be sub-result of result @@ -1831,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()) { @@ -1849,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()); @@ -1866,17 +1882,26 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t 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 { @@ -1889,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) @@ -1918,32 +1959,35 @@ 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(); do { - TDF_Label aNextLabel = nextLabel(aFeatureLabel, theReverse); + TDF_Label aNextLabel = nextLabel(aFeatureLabel, theIndex, theReverse); if (aNextLabel.IsNull()) - break; // last or something is wrong + break; // the last or something is wrong FeaturePtr aFound = feature(aNextLabel); if (aFound) return aFound; // the feature is found @@ -1967,11 +2011,12 @@ FeaturePtr Model_Objects::lastFeature() { Handle(TDataStd_ReferenceArray) aRefs; if (featuresLabel().FindAttribute(TDataStd_ReferenceArray::GetID(), aRefs)) { - FeaturePtr aLast = feature(aRefs->Value(aRefs->Upper())); + // 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