Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

[modules/hydro.git] / src / HYDROData / HYDROData_Document.h

diff --git a/src/HYDROData/HYDROData_Document.h b/src/HYDROData/HYDROData_Document.h
index 910e318fdacc4622e9e8fb555bb1290a58e00134..e3c7b1c81821d9ebeff01bffad29c1ec17fbda3e 100644 (file)
--- a/src/HYDROData/HYDROData_Document.h
+++ b/src/HYDROData/HYDROData_Document.h
@@ -103,13 +103,18 @@ public:
   //! Dump study document to Python script representation.
   //! \param theFileName full name of the file to store
   //! \returns true if document has been successfuly dumped
-  HYDRODATA_EXPORT bool DumpToPython( const QString& theFileName,
+  HYDRODATA_EXPORT bool DumpToPython( const QString& thePyScriptPath,
                                       const bool     theIsMultiFile ) const;
 
   //! Dump model data to Python script representation.
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects,
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects,
                                                      const bool           theIsMultiFile ) const;
 
+  HYDRODATA_EXPORT void CollectQGISValues( const QString& theAttrName,
+                                           QStringList& theAttrValues,
+                                           QStringList& theStricklerTypes ) const;
+
 public:
 
   // Methods to work with objects presentation.
@@ -225,8 +230,7 @@ public:
   //! Sets default strickler coefficient
   HYDRODATA_EXPORT void SetDefaultStricklerCoefficient( double ) const;
 
-  HYDRODATA_EXPORT QColor HYDROData_Document::GetAssociatedColor(const QString& theStricklerType, 
-  const Handle(HYDROData_StricklerTable)& theTable);
+  HYDRODATA_EXPORT QColor GetAssociatedColor( const QString& theStricklerType, const Handle(HYDROData_StricklerTable)& theTable ) const;
 
 protected:
   friend class HYDROData_Iterator;
@@ -255,6 +259,7 @@ private:
 
   // Dump objects of type \c theObjectKind to file \c theFile
   bool dumpPartitionToPython( QFile&               theFile,
+                              const QString&       thePyScriptPath,
                               const bool           theIsMultiFile,
                               MapOfTreatedObjects& theDumpedObjects,
                               const ObjectKind&    theObjectKind ) const;