X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Objects.cpp;h=41b019b9b386d5425e37240e93fc32a2af8e1eb7;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=ef4d72a523fa5ab81bf905ba36e0a16156de3ca6;hpb=f14192492e36f4febc93b2ad7ab7f866cbbdf71b;p=modules%2Fshaper.git diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp index ef4d72a52..41b019b9b 100644 --- a/src/Model/Model_Objects.cpp +++ b/src/Model/Model_Objects.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,8 @@ #include #include +#include + #include #include #include @@ -49,6 +51,10 @@ #include #include +// for TDF_Label map usage +static Standard_Integer HashCode(const TDF_Label& theLab, const Standard_Integer theUpper); +static Standard_Boolean IsEqual(const TDF_Label& theLab1, const TDF_Label& theLab2); + int kUNDEFINED_FEATURE_INDEX = -1; static const std::string& groupNameFoldering(const std::string& theGroupID, @@ -619,9 +625,6 @@ ObjectPtr Model_Objects::object(const std::string& theGroupID, return ObjectPtr(); createHistory(theGroupID); const std::string& aGroupID = groupNameFoldering(theGroupID, theAllowFolder); - 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]; } @@ -734,7 +737,7 @@ static std::wstring composeName(const std::string& theFeatureKind, const int the { std::stringstream aNameStream; aNameStream << theFeatureKind << "_" << theIndex; - return ModelAPI_Tools::toWString(aNameStream.str()); + return Locale::Convert::toWString(aNameStream.str()); } void Model_Objects::setUniqueName(FeaturePtr theFeature) @@ -809,11 +812,11 @@ void Model_Objects::synchronizeFeatures( return; // after all updates, sends a message that groups of features were created or updated Events_Loop* aLoop = Events_Loop::loop(); - static Events_ID aDispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); - static Events_ID aCreateEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED); - static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); + //static Events_ID aDispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); + static Events_ID aCreateEvent = aLoop->eventByName(EVENT_OBJECT_CREATED); + static Events_ID anUpdateEvent = aLoop->eventByName(EVENT_OBJECT_UPDATED); static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); - static Events_ID aDeleteEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED); + static Events_ID aDeleteEvent = aLoop->eventByName(EVENT_OBJECT_DELETED); static Events_ID aToHideEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); bool isActive = aLoop->activateFlushes(false); @@ -892,10 +895,8 @@ void Model_Objects::synchronizeFeatures( 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++) + anAttrs = (*aResIter)->data()->attributes(""); + for(anAttr = anAttrs.begin(); anAttr != anAttrs.end(); anAttr++) (*anAttr)->reinit(); } } @@ -1188,7 +1189,7 @@ TDF_Label Model_Objects::resultLabel( bool Model_Objects::hasCustomName(DataPtr theFeatureData, ResultPtr theResult, - int theResultIndex, + int /*theResultIndex*/, std::wstring& theParentName) const { ResultBodyPtr aBodyRes = std::dynamic_pointer_cast(theFeatureData->owner()); @@ -1225,7 +1226,8 @@ bool Model_Objects::hasCustomName(DataPtr theFeatureData, void Model_Objects::storeResult(std::shared_ptr theFeatureData, std::shared_ptr theResult, - const int theResultIndex) + const int theResultIndex, + const std::wstring& theNameShape) { theResult->init(); theResult->setDoc(myDoc); @@ -1239,11 +1241,15 @@ void Model_Objects::storeResult(std::shared_ptr theFeatureData, theResult->data()->setName(L""); } else { std::wstringstream aName; - aName << aNewName; - // if there are several results (issue #899: any number of result), - // add unique prefix starting from second - if (theResultIndex > 0 || theResult->groupName() == ModelAPI_ResultBody::group()) - aName << "_" << theResultIndex + 1; + if ( theNameShape != L"" ){ + aName << theNameShape; + } else { + aName << aNewName; + // if there are several results (issue #899: any number of result), + // add unique prefix starting from second + if (theResultIndex > 0 || theResult->groupName() == ModelAPI_ResultBody::group()) + aName << "_" << theResultIndex + 1; + } aNewName = aName.str(); } theResult->data()->setName(aNewName); @@ -1268,7 +1274,9 @@ std::shared_ptr Model_Objects::createConstruction( } std::shared_ptr Model_Objects::createBody( - const std::shared_ptr& theFeatureData, const int theIndex) + const std::shared_ptr& theFeatureData, + const int theIndex, + const std::wstring& theNameShape) { TDF_Label aLab = resultLabel(theFeatureData, theIndex); TDataStd_Comment::Set(aLab, ModelAPI_ResultBody::group().c_str()); @@ -1279,7 +1287,7 @@ std::shared_ptr Model_Objects::createBody( } if (!aResult.get()) { aResult = std::shared_ptr(new Model_ResultBody); - storeResult(theFeatureData, aResult, theIndex); + storeResult(theFeatureData, aResult, theIndex, theNameShape); } return aResult; } @@ -1826,7 +1834,7 @@ std::string Model_Objects::featureResultGroup(FeaturePtr theFeature) if (aLabIter.More()) { TDF_Label anArgLab = aLabIter.Value(); Handle(TDataStd_Comment) aGroup; - if (aLabIter.Value().FindAttribute(TDataStd_Comment::GetID(), aGroup)) { + if (anArgLab.FindAttribute(TDataStd_Comment::GetID(), aGroup)) { return TCollection_AsciiString(aGroup->Get()).ToCString(); } } @@ -1885,7 +1893,7 @@ 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()) { - if (aResIndex <= theFeature->results().size()) { // to avoid crash if previous execute + if (aResIndex <= (int)theFeature->results().size()) {// to avoid crash if previous execute // for index = 0 erases result std::shared_ptr aNewP = createPart(theFeature->data(), aResIndex); if (!aNewP->data()->isDeleted()) { @@ -1897,10 +1905,12 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t } } else if (aGroup->Get() == ModelAPI_ResultConstruction::group().c_str()) { 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 + if (!aConstr->data()->isDeleted()) { + 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()) { @@ -2029,6 +2039,8 @@ FeaturePtr Model_Objects::lastFeature() bool Model_Objects::isLater(FeaturePtr theLater, FeaturePtr theCurrent) const { + if (theLater->getKind() == "InternalSelectionInPartFeature") + return true; std::shared_ptr aLaterD = std::static_pointer_cast(theLater->data()); std::shared_ptr aCurrentD = std::static_pointer_cast(theCurrent->data()); if (aLaterD.get() && aLaterD->isValid() && aCurrentD.get() && aCurrentD->isValid()) { @@ -2103,7 +2115,6 @@ std::shared_ptr Model_Objects::internalFeature(const int theIn Standard_Integer HashCode(const TDF_Label& theLab, const Standard_Integer theUpper) { return TDF_LabelMapHasher::HashCode(theLab, theUpper); - } Standard_Boolean IsEqual(const TDF_Label& theLab1, const TDF_Label& theLab2) {