X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Objects.cpp;h=320bc86becb0c57933dc60136aa6bc64205444ee;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=ce23976c3b7feae52fde59411bc1d9e5a8c4e5d8;hpb=8f43b985d2f7170b8dfa06abd3edc7d6cb0c2e1f;p=modules%2Fshaper.git diff --git a/src/Model/Model_Objects.cpp b/src/Model/Model_Objects.cpp index ce23976c3..320bc86be 100644 --- a/src/Model/Model_Objects.cpp +++ b/src/Model/Model_Objects.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2020 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 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 @@ -38,6 +38,8 @@ #include #include +#include + #include #include #include @@ -627,7 +629,7 @@ ObjectPtr Model_Objects::object(const std::string& theGroupID, } std::shared_ptr Model_Objects::objectByName( - const std::string& theGroupID, const std::string& theName) + const std::string& theGroupID, const std::wstring& theName) { createHistory(theGroupID); if (theGroupID == ModelAPI_Feature::group()) { // searching among features (in history or not) @@ -731,22 +733,22 @@ TDF_Label Model_Objects::featuresLabel() const return myMain.FindChild(TAG_OBJECTS); } -static std::string composeName(const std::string& theFeatureKind, const int theIndex) +static std::wstring composeName(const std::string& theFeatureKind, const int theIndex) { std::stringstream aNameStream; aNameStream << theFeatureKind << "_" << theIndex; - return aNameStream.str(); + return Locale::Convert::toWString(aNameStream.str()); } void Model_Objects::setUniqueName(FeaturePtr theFeature) { if (!theFeature->data()->name().empty()) return; // not needed, name is already defined - std::string aName; // result + std::wstring aName; // result // 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; + std::set allNames; for (; aFIter.More(); aFIter.Next()) { if (aFIter.Value()->getKind() == theFeature->getKind()) aNumObjects++; @@ -767,7 +769,7 @@ void Model_Objects::setUniqueName(FolderPtr theFolder) return; // name is already defined int aNbFolders = myFolders.Size(); - std::string aName = composeName(ModelAPI_Folder::ID(), aNbFolders); + std::wstring aName = composeName(ModelAPI_Folder::ID(), aNbFolders); // check the uniqueness of the name NCollection_DataMap::Iterator anIt(myFolders); @@ -1188,7 +1190,7 @@ TDF_Label Model_Objects::resultLabel( bool Model_Objects::hasCustomName(DataPtr theFeatureData, ResultPtr theResult, int /*theResultIndex*/, - std::string& theParentName) const + std::wstring& theParentName) const { ResultBodyPtr aBodyRes = std::dynamic_pointer_cast(theFeatureData->owner()); if (aBodyRes) { @@ -1199,7 +1201,7 @@ bool Model_Objects::hasCustomName(DataPtr theFeatureData, // 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.) if (std::dynamic_pointer_cast(aBodyRes->data())->label().Depth() == 6) { - std::ostringstream aDefaultName; + std::wostringstream aDefaultName; // compute default name of CompSolid (name of feature + index of CompSolid's result) int aBodyResultIndex = 0; const std::list& aResults = anOwner->results(); @@ -1216,7 +1218,7 @@ bool Model_Objects::hasCustomName(DataPtr theFeatureData, return false; } - std::pair aName = ModelAPI_Tools::getDefaultName(theResult); + std::pair aName = ModelAPI_Tools::getDefaultName(theResult); if (aName.second) theParentName = aName.first; return aName.second; @@ -1224,25 +1226,30 @@ 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); initData(theResult, resultLabel(theFeatureData, theResultIndex), TAG_FEATURE_ARGUMENTS); if (theResult->data()->name().empty()) { // if was not initialized, generate event and set a name - std::string aNewName = theFeatureData->name(); + std::wstring aNewName = theFeatureData->name(); 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(""); + theResult->data()->setName(L""); } else { - std::stringstream 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; + std::wstringstream aName; + 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); @@ -1267,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()); @@ -1278,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; } @@ -1896,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()) { @@ -1936,7 +1947,7 @@ void Model_Objects::updateResults(FeaturePtr theFeature, std::set& t } } -ResultPtr Model_Objects::findByName(const std::string theName) +ResultPtr Model_Objects::findByName(const std::wstring theName) { ResultPtr aResult; FeaturePtr aResFeature; // keep feature to return the latest one