Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 05bb766633c6704ee995ded5222ad0f969358f16..5be02deedd6b8dea9a93a0f8e6dd7eb42ce11a90 100644
(file)
--- a/
src/HYDROData/HYDROData_Image.h
+++ b/
src/HYDROData/HYDROData_Image.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-25,10
+21,16
@@
#include <HYDROData_Entity.h>
#include <HYDROData_Entity.h>
+#ifdef WIN32
+ #pragma warning ( disable: 4251 )
+#endif
+
#include <QImage>
#include <QTransform>
#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.
/**\class HYDROData_Image
* \brief Class that stores/retreives information about the image.
@@
-64,7
+66,7
@@
protected:
};
public:
};
public:
- DEFINE_STANDARD_RTTI
(HYDROData_Image
);
+ DEFINE_STANDARD_RTTI
EXT(HYDROData_Image, HYDROData_Entity
);
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
@@
-74,7
+76,8
@@
public:
/**
* Dump Image object to Python script representation.
*/
/**
* 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.
/**
* Updates object state.
@@
-358,16
+361,16
@@
public:
/**
/**
- * Marks the image as self-split
ted
.
- * \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 SetIsSelfSplit
ted
(bool theFlag);
+ HYDRODATA_EXPORT void SetIsSelfSplit(bool theFlag);
/**
/**
- * Checks that the image is self-split
ted
.
- * \returns true if image is self-split
ted
+ * Checks that the image is self-split.
+ * \returns true if image is self-split
*/
*/
- HYDRODATA_EXPORT bool IsSelfSplit
ted
() const;
+ HYDRODATA_EXPORT bool IsSelfSplit() const;
private:
private: