Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROData/HYDROData_Image.h b/src/HYDROData/HYDROData_Image.h
index ed5892111304b3f371c95a4329ab01336fec12ab..5be02deedd6b8dea9a93a0f8e6dd7eb42ce11a90 100644 (file)
--- a/src/HYDROData/HYDROData_Image.h
+++ b/src/HYDROData/HYDROData_Image.h
@@ -21,10 +21,16 @@
 
 #include <HYDROData_Entity.h>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <QImage>
 #include <QTransform>
 
-DEFINE_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
 
 /**\class HYDROData_Image
  * \brief Class that stores/retreives information about the image.
@@ -60,7 +66,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Image);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -70,7 +76,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 +361,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: