X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_Recover.cpp;h=b9497c0f1f1d40d62f2c293e1a949ee2e2abad21;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=40637b30bef9a47c4cb6f2053901dc22a5e64232;hpb=fa16bd63a969591127eea4d3959ca738d56d2e0f;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/FeaturesAPI_Recover.cpp b/src/FeaturesAPI/FeaturesAPI_Recover.cpp index 40637b30b..b9497c0f1 100644 --- a/src/FeaturesAPI/FeaturesAPI_Recover.cpp +++ b/src/FeaturesAPI/FeaturesAPI_Recover.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesAPI_Recover.cpp -// Created: 07 June 2016 -// Author: Dmitry Bobylev +// 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "FeaturesAPI_Recover.h" @@ -20,11 +33,16 @@ FeaturesAPI_Recover::FeaturesAPI_Recover(const std::shared_ptr //================================================================================================= FeaturesAPI_Recover::FeaturesAPI_Recover(const std::shared_ptr& theFeature, const ModelHighAPI_Reference& theBaseFeature, - const std::list& theRecoveredList, const bool thePersistent) + const std::list& theRecoveredList, + const bool theRecoverCompound) : ModelHighAPI_Interface(theFeature) { - if(initialize()) { - setBaseFeature(theBaseFeature); + if (initialize()) { + std::string aMethod = theRecoverCompound ? FeaturesPlugin_Recover::METHOD_COMPOUND() + : FeaturesPlugin_Recover::METHOD_DEFAULT(); + fillAttribute(aMethod, theFeature->string(FeaturesPlugin_Recover::METHOD())); + + fillAttribute(theBaseFeature.feature(), mybaseFeature); setRecoveredList(theRecoveredList); } } @@ -38,14 +56,14 @@ void FeaturesAPI_Recover::setBaseFeature(const ModelHighAPI_Reference& theBaseFe { fillAttribute(theBaseFeature.feature(), mybaseFeature); - // do not need to execute because on attribute changed it does everything anyway + execute(); } //================================================================================================= void FeaturesAPI_Recover::setRecoveredList(const std::list& theRecoverList) { fillAttribute(theRecoverList, myrecoveredList); - // do not need to execute because on attribute changed it does everything anyway + execute(); } //================================================================================================== @@ -62,15 +80,22 @@ void FeaturesAPI_Recover::dump(ModelHighAPI_Dumper& theDumper) const FeaturePtr aFeature = ModelAPI_Feature::feature(anAttrBaseFeature->value()); theDumper << aBase << " = model.addRecover(" << aDocName << ", " - << aFeature << ", " << anAttrRecoveredEntities << ")" << std::endl; + << aFeature << ", " << anAttrRecoveredEntities; + + AttributeStringPtr aMethod = aBase->string(FeaturesPlugin_Recover::METHOD()); + if (aMethod && aMethod->isInitialized() && + aMethod->value() != FeaturesPlugin_Recover::METHOD_DEFAULT()) + theDumper << ", " << true; + + theDumper << ")" << std::endl; } //================================================================================================= RecoverPtr addRecover(const std::shared_ptr& thePart, const ModelHighAPI_Reference& theBaseFeature, - const std::list& theRecoveredList, const bool thePersistent) + const std::list& theRecoveredList, const bool theRecoverCompound) { std::shared_ptr aFeature = thePart->addFeature(FeaturesAPI_Recover::ID()); return RecoverPtr(new FeaturesAPI_Recover( - aFeature, theBaseFeature, theRecoveredList, thePersistent)); + aFeature, theBaseFeature, theRecoveredList, theRecoverCompound)); }