From: azv <azv@opencascade.com>
Date: Tue, 9 Aug 2016 11:26:03 +0000 (+0300)
Subject: Dump Python in the High Level Parameterized Geometry API (issue #1648)
X-Git-Tag: V_2.5.0~137^2~83
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bd1bcf821858607eabc12f6f191f9b216d325a25;p=modules%2Fshaper.git

Dump Python in the High Level Parameterized Geometry API (issue #1648)

Workaround to create sketch entities, used in constraint, before the constraint itself.
---

diff --git a/src/ExchangePlugin/ExchangePlugin_Dump.cpp b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
index d89f6d98a..168e9dc19 100644
--- a/src/ExchangePlugin/ExchangePlugin_Dump.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_Dump.cpp
@@ -46,6 +46,7 @@ void ExchangePlugin_Dump::dump(const std::string& theFileName)
   Config_ModuleReader::loadScript("model.dump");
 
   ModelHighAPI_Dumper* aDumper = ModelHighAPI_Dumper::getInstance();
+  aDumper->clear();
   DocumentPtr aDoc = ModelAPI_Session::get()->moduleDocument();
   if (!aDumper || !aDumper->process(aDoc, theFileName))
     setError("An error occured while dumping to " + theFileName);
diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
index e1ed55d36..ee7894f50 100644
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.cpp
@@ -54,10 +54,26 @@ ModelHighAPI_Dumper* ModelHighAPI_Dumper::getInstance()
   return mySelf;
 }
 
-void ModelHighAPI_Dumper::clear()
+void ModelHighAPI_Dumper::clear(bool bufferOnly)
 {
   myDumpBuffer = std::ostringstream();
   myDumpBuffer << std::setprecision(16);
+
+  clearNotDumped();
+
+  if (!bufferOnly) {
+    myFullDump = std::ostringstream();
+    myFullDump << std::setprecision(16);
+
+    myNames.clear();
+    myModules.clear();
+    myLastEntityWithName = EntityPtr();
+  }
+}
+
+void ModelHighAPI_Dumper::clearNotDumped()
+{
+  myNotDumpedEntities.clear();
 }
 
 const std::string& ModelHighAPI_Dumper::name(const EntityPtr& theEntity)
@@ -85,6 +101,7 @@ const std::string& ModelHighAPI_Dumper::name(const EntityPtr& theEntity)
   }
 
   myNames[theEntity] = std::pair<std::string, bool>(aName, isNameDefined);
+  myNotDumpedEntities.insert(theEntity);
   return myNames[theEntity].first;
 }
 
@@ -118,14 +135,11 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_Document>& theD
 bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_Document>& theDoc)
 {
   bool isOk = true;
-  CompositeFeaturePtr aLastComposite;
   // dump all features
   std::list<FeaturePtr> aFeatures = theDoc->allFeatures();
   std::list<FeaturePtr>::const_iterator aFeatIt = aFeatures.begin();
   for (; aFeatIt != aFeatures.end(); ++aFeatIt) {
-    // dump feature if and only if it is not a sub-feature of last composite feature
-    // (all subs of composite are dumped in special method)
-    if (!aLastComposite || !aLastComposite->isSub(*aFeatIt))
+    if (!isDumped(*aFeatIt))
       dumpFeature(*aFeatIt);
 
     // iteratively process composite features
@@ -144,10 +158,8 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_Document>& theD
       myNames[aSubDoc] = myNames[*aFeatIt];
 
       isOk = process(aSubDoc) && isOk;
-    } else {
+    } else
       isOk = process(aCompFeat) && isOk;
-      aLastComposite = aCompFeat;
-    }
   }
   return isOk;
 }
@@ -158,7 +170,8 @@ bool ModelHighAPI_Dumper::process(const std::shared_ptr<ModelAPI_CompositeFeatur
   int aNbSubs = theComposite->numberOfSubs();
   for (int anIndex = 0; anIndex < aNbSubs; ++anIndex) {
     FeaturePtr aFeature = theComposite->subFeature(anIndex);
-    dumpFeature(aFeature, true);
+    if (!isDumped(aFeature))
+      dumpFeature(aFeature, true);
   }
   // dump command to update model
   myDumpBuffer << "model.do()" << std::endl;
@@ -195,7 +208,7 @@ bool ModelHighAPI_Dumper::exportTo(const std::string& theFileName)
   aFile << "model.begin()" << std::endl;
 
   // dump collected data
-  aFile << myDumpBuffer.str();
+  aFile << myFullDump.str();
 
   // standard footer
   aFile << "model.end()" << std::endl;
@@ -228,6 +241,12 @@ void ModelHighAPI_Dumper::dumpEntitySetName()
   myLastEntityWithName = EntityPtr();
 }
 
+bool ModelHighAPI_Dumper::isDumped(const EntityPtr& theEntity) const
+{
+  EntityNameMap::const_iterator aFound = myNames.find(theEntity);
+  return aFound != myNames.end();
+}
+
 ModelHighAPI_Dumper& ModelHighAPI_Dumper::operator<<(const char theChar)
 {
   myDumpBuffer << theChar;
@@ -355,6 +374,7 @@ ModelHighAPI_Dumper& ModelHighAPI_Dumper::operator<<(const EntityPtr& theEntity)
   myDumpBuffer << name(theEntity);
   if (myNames[theEntity].second)
     myLastEntityWithName = theEntity;
+  myNotDumpedEntities.erase(theEntity);
   return *this;
 }
 
@@ -397,5 +417,19 @@ ModelHighAPI_Dumper& operator<<(ModelHighAPI_Dumper& theDumper,
 {
   theDumper.myDumpBuffer << theEndl;
   theDumper.dumpEntitySetName();
+
+  // store all not-dumped entities first
+  std::set<EntityPtr> aNotDumped = theDumper.myNotDumpedEntities;
+  std::string aBufCopy = theDumper.myDumpBuffer.str();
+  theDumper.clear(true);
+  std::set<EntityPtr>::const_iterator anIt = aNotDumped.begin();
+  for (; anIt != aNotDumped.end(); ++anIt) {
+    FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(*anIt);
+    theDumper.dumpFeature(aFeature, true);
+  }
+
+  // then store currently dumped string
+  theDumper.myFullDump << aBufCopy;
+
   return theDumper;
 }
diff --git a/src/ModelHighAPI/ModelHighAPI_Dumper.h b/src/ModelHighAPI/ModelHighAPI_Dumper.h
index c653e5067..200262fdb 100644
--- a/src/ModelHighAPI/ModelHighAPI_Dumper.h
+++ b/src/ModelHighAPI/ModelHighAPI_Dumper.h
@@ -155,13 +155,16 @@ public:
   MODELHIGHAPI_EXPORT
   ModelHighAPI_Dumper& operator<<(const std::shared_ptr<ModelAPI_AttributeSelection>& theAttrSelect);
 
+  /// Clear dump buffer
+  MODELHIGHAPI_EXPORT
+  void clear(bool bufferOnly = false);
+  /// clear list of not dumped entities
+  MODELHIGHAPI_EXPORT void clearNotDumped();
+
 protected:
   /// Dump "setName" command if last entity had user-defined name
   MODELHIGHAPI_EXPORT void dumpEntitySetName();
 
-  /// Clear dump buffer
-  void clear();
-
 private:
   ModelHighAPI_Dumper(const ModelHighAPI_Dumper&);
   const ModelHighAPI_Dumper& operator=(const ModelHighAPI_Dumper&);
@@ -172,6 +175,9 @@ private:
   /// Iterate all features in composite feature and dump them into intermediate buffer
   bool process(const std::shared_ptr<ModelAPI_CompositeFeature>& theComposite);
 
+  /// Check the entity is already dumped
+  bool isDumped(const EntityPtr& theEntity) const;
+
 private:
   typedef std::map<EntityPtr, std::pair<std::string, bool> > EntityNameMap;
   typedef std::map<std::string, std::set<std::string> >      ModulesMap;
@@ -179,9 +185,14 @@ private:
   static ModelHighAPI_Dumper* mySelf;
 
   std::ostringstream  myDumpBuffer;         ///< intermediate buffer to store dumping data
+  std::ostringstream  myFullDump;           ///< full buffer of dumped data
+
   ModulesMap          myModules;            ///< modules and entities to be imported
   EntityNameMap       myNames;              ///< names of the entities
   EntityPtr           myLastEntityWithName; ///< not null, if last dumped entity had user defined name
+
+protected:
+  std::set<EntityPtr> myNotDumpedEntities;  ///< list of entities, used by other features but not dumped yet
 };
 
 #endif
diff --git a/src/PythonAPI/model/dump/DumpAssistant.py b/src/PythonAPI/model/dump/DumpAssistant.py
index 7aa341b98..dc4c87384 100644
--- a/src/PythonAPI/model/dump/DumpAssistant.py
+++ b/src/PythonAPI/model/dump/DumpAssistant.py
@@ -44,6 +44,7 @@ class DumpAssistant(ModelHighAPI.ModelHighAPI_Dumper):
                 self.myFeatures[aFeatureKind](theFeature).dump(self)
             else:
                 self.name(theFeature)
+                self.clearNotDumped()
         else:
             # Probably the feature is a constraint, try to dump it with SketchAPI_Constraint.
             # In case of theFeature is not a constraint, it will not be dumped.