merge master

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

diff --git a/src/HYDROData/HYDROData_Image.h b/src/HYDROData/HYDROData_Image.h
index ed5892111304b3f371c95a4329ab01336fec12ab..5a25af9ee633a20ce5e2f760476b7bd1aa2aa770 100644 (file)
--- a/src/HYDROData/HYDROData_Image.h
+++ b/src/HYDROData/HYDROData_Image.h
@@ -21,9 +21,17 @@
 
 #include <HYDROData_Entity.h>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <QImage>
 #include <QTransform>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 DEFINE_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
 
 /**\class HYDROData_Image
@@ -70,7 +78,8 @@ public:
   /**
    * Dump Image object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Updates object state.
@@ -354,16 +363,16 @@ public:
   
 
   /**
-   * Marks the image as self-splitted.
-   * \param theFlag is true for self-splitted image
+   * Marks the image as self-split.
+   * \param theFlag is true for self-plit image
    */
-  HYDRODATA_EXPORT void SetIsSelfSplitted(bool theFlag);
+  HYDRODATA_EXPORT void SetIsSelfSplit(bool theFlag);
 
   /**
-   * Checks that the image is self-splitted.
-   * \returns true if image is self-splitted
+   * Checks that the image is self-split.
+   * \returns true if image is self-split
    */
-  HYDRODATA_EXPORT bool IsSelfSplitted() const;
+  HYDRODATA_EXPORT bool IsSelfSplit() const;
 
 private: