Fix issues related to Python dump.

[modules/shaper.git] / src / ModelHighAPI / ModelHighAPI_Dumper.cpp

diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index 89546d145200f2a34446018bd4e34e5201c14e50..ef0aee3c2ad356717cd8227c5d3415de233f3306 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -484,6 +484,7 @@ void ModelHighAPI_Dumper::importModule(const std::string& theModuleName,
 void ModelHighAPI_Dumper::dumpEntitySetName()
 {
   const LastDumpedEntity& aLastDumped = myEntitiesStack.top();
+  bool isBufferEmpty = myDumpBuffer.str().empty();
 
   // dump "setName" for the entity
   if (aLastDumped.myUserName) {
@@ -539,6 +540,12 @@ void ModelHighAPI_Dumper::dumpEntitySetName()
 
   myNames[aLastDumped.myEntity].myIsDumped = true;
   myEntitiesStack.pop();
+
+  // clean buffer if it was clear before
+  if (isBufferEmpty) {
+    myFullDump << myDumpBuffer.str();
+    myDumpBuffer.str("");
+  }
 }
 
 bool ModelHighAPI_Dumper::isDumped(const EntityPtr& theEntity) const
@@ -1018,9 +1025,21 @@ ModelHighAPI_Dumper& ModelHighAPI_Dumper::operator<<(
     // save buffer and clear it again
     std::string aDumpedList = myDumpBuffer.str();
     myDumpBuffer.str("");
-    // obtain name of list
+    // obtain name of list (the feature may contain several selection lists)
     FeaturePtr anOwner = ModelAPI_Feature::feature(theAttrSelList->owner());
     std::string aListName = name(anOwner) + "_objects";
+    std::list<AttributePtr> aSelLists =
+        anOwner->data()->attributes(ModelAPI_AttributeSelectionList::typeId());
+    if (aSelLists.size() > 1) {
+      int anIndex = 1;
+      for (std::list<AttributePtr>::iterator aSIt = aSelLists.begin();
+           aSIt != aSelLists.end(); ++aSIt, ++anIndex)
+        if ((*aSIt).get() == theAttrSelList.get())
+          break;
+      std::ostringstream aSStream;
+      aSStream << aListName << "_" << anIndex;
+      aListName = aSStream.str();
+    }
     // store all previous data
     myDumpBuffer << aListName << " = " << aDumpedList << std::endl
                  << aDumped << aListName;