X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelHighAPI%2FModelHighAPI_Folder.cpp;h=16c3b6dc4d7789c0c8e525db489e46fd6287d556;hb=26a7489eb80cc314d2719eb88c243affff2d7428;hp=a4402a5e623cc1413f9ab9571b30d0739b005c47;hpb=afcb6562f38474c4bfcbdd8269a377a697c85934;p=modules%2Fshaper.git diff --git a/src/ModelHighAPI/ModelHighAPI_Folder.cpp b/src/ModelHighAPI/ModelHighAPI_Folder.cpp index a4402a5e6..16c3b6dc4 100644 --- a/src/ModelHighAPI/ModelHighAPI_Folder.cpp +++ b/src/ModelHighAPI/ModelHighAPI_Folder.cpp @@ -21,6 +21,7 @@ #include "ModelHighAPI_Folder.h" #include #include +#include #include #include @@ -66,14 +67,14 @@ void ModelHighAPI_Folder::dump(ModelHighAPI_Dumper& theDumper) const AttributeReferencePtr aEndRef = myFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID()); // Dump folder if it is empty or when its features have been already dumped. - // Otherwise, just store the name of the folder. + // Otherwise, store the folder postponed. if (!aEndRef->value()) theDumper << myFolder << " = model.addFolder(" << aDocName << ")" << std::endl; - else if (theDumper.isDumped(aEndRef->value())) + else if (theDumper.isDumped(EntityPtr(aEndRef->value()))) theDumper << myFolder << " = model.addFolder(" << aDocName << ", " << aStartRef << ", " << aEndRef << ")" << std::endl; else - theDumper.name(myFolder); + theDumper.postpone(myFolder); } //-------------------------------------------------------------------------------------- @@ -91,10 +92,10 @@ std::shared_ptr addFolder(const std::shared_ptr aFolder = theDoc->addFolder(theFirstFeature.feature()); AttributeReferencePtr aFirstFeatAttr = aFolder->reference(ModelAPI_Folder::FIRST_FEATURE_ID()); - theFirstFeature.fillAttribute(aFirstFeatAttr); + fillAttribute(theFirstFeature.feature(), aFirstFeatAttr); AttributeReferencePtr aLastFeatAttr = aFolder->reference(ModelAPI_Folder::LAST_FEATURE_ID()); - theLastFeature.fillAttribute(aLastFeatAttr); + fillAttribute(theLastFeature.feature(), aLastFeatAttr); return std::shared_ptr(new ModelHighAPI_Folder(aFolder)); }