Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP

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

diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx
index b7ec1096ac9388886b0eee97984c45381809d7d6..4e91edafb18e9e543e5069a31cb8f3f5ca54827b 100644 (file)
--- a/src/HYDROData/HYDROData_Image.cxx
+++ b/src/HYDROData/HYDROData_Image.cxx
@@ -30,12 +30,20 @@
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_AsciiString.hxx>
 
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
+
 #include <ImageComposer_Operator.h>
 #include <ImageComposer_MetaTypes.h>
 
 #include <QStringList>
 #include <QFile>
 
+#ifdef WIN32
+  #pragma warning ( default: 4251 )
+#endif
+
 #include <boost/math/special_functions/fpclassify.hpp>
 
 static const Standard_GUID GUID_SELF_SPLITTED("997995aa-5c19-40bf-9a60-ab4b70ad04d8");
@@ -46,7 +54,7 @@ IMPLEMENT_STANDARD_HANDLE(HYDROData_Image, HYDROData_Entity)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Image, HYDROData_Entity)
 
 HYDROData_Image::HYDROData_Image()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d )
 {
 }
 
@@ -175,7 +183,7 @@ QStringList HYDROData_Image::DumpToPython( MapOfTreatedObjects& theTreatedObject
 
 void HYDROData_Image::Update()
 {
-  bool anIsToUpdate = IsMustBeUpdated();
+  bool anIsToUpdate = IsMustBeUpdated( Geom_2d );
 
   HYDROData_Entity::Update();
 
@@ -226,7 +234,7 @@ void HYDROData_Image::Update()
     UpdateTrsf();
   }
 
-  SetToUpdate( false );
+  ClearChanged();
 }
 
 bool HYDROData_Image::IsHas2dPrs() const
@@ -294,7 +302,7 @@ void HYDROData_Image::SetImage(const QImage& theImage)
     SaveByteArray(0, aData, anImage.byteCount());
   }
 
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_Image::LoadImage( const QString& theFilePath )
@@ -326,7 +334,7 @@ void HYDROData_Image::SetFilePath( const QString& theFilePath )
   TCollection_AsciiString anAsciiStr( theFilePath.toStdString().c_str() );
   TDataStd_AsciiString::Set( myLab.FindChild( DataTag_FilePath ), anAsciiStr );
 
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 QString HYDROData_Image::GetFilePath() const
@@ -362,7 +370,7 @@ void HYDROData_Image::SetTrsf(const QTransform& theTrsf)
   anArray->SetValue(8, theTrsf.m32());
   anArray->SetValue(9, theTrsf.m33());
 
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 QTransform HYDROData_Image::Trsf() const
@@ -507,7 +515,7 @@ void HYDROData_Image::RemoveAllReferences()
   QImage anImage = Image();
   if ( anImage.isNull() )
   {
-    SetToUpdate( false );
+    ClearChanged();
     return;
   }
 
@@ -528,7 +536,7 @@ void HYDROData_Image::RemoveAllReferences()
 
   SetGlobalPoints( ManualCartesian, aTrsfPointA, aTrsfPointB, aTrsfPointC );
 
-  SetToUpdate( false );
+  ClearChanged();
 }
 
 void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
@@ -552,7 +560,7 @@ void HYDROData_Image::SetLocalPoints( const QPoint& thePointA,
   if ( theIsUpdate )
     UpdateTrsf();
 
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_Image::GetLocalPoints( QPoint& thePointA,
@@ -607,7 +615,7 @@ void HYDROData_Image::SetGlobalPoints( const TransformationMode& theMode,
   if ( theIsUpdate )
     UpdateTrsf();
 
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_Image::GetGlobalPoints( TransformationMode& theMode,
@@ -759,7 +767,7 @@ bool HYDROData_Image::HasReferencePoints() const
 void HYDROData_Image::SetTrsfMode( const TransformationMode& theMode )
 {
   TDataStd_Integer::Set( myLab.FindChild( DataTag_TrsfMode ), (int)theMode );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
@@ -780,7 +788,7 @@ HYDROData_Image::TransformationMode HYDROData_Image::GetTrsfMode() const
 void HYDROData_Image::SetTrsfReferenceImage( const Handle(HYDROData_Image)& theRefImage )
 {
   SetReferenceObject( theRefImage, DataTag_TrsfImage );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const
@@ -791,13 +799,13 @@ Handle(HYDROData_Image) HYDROData_Image::GetTrsfReferenceImage() const
 void HYDROData_Image::RemoveTrsfReferenceImage()
 {
   RemoveReferenceObject( DataTag_TrsfImage );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_Image::AppendReference( const Handle(HYDROData_Entity)& theReferenced )
 {
   AddReferenceObject( theReferenced, 0 );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 int HYDROData_Image::NbReferences() const
@@ -814,26 +822,26 @@ void HYDROData_Image::ChangeReference(
     const int theIndex, Handle(HYDROData_Entity) theReferenced)
 {
   SetReferenceObject( theReferenced, 0, theIndex );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_Image::RemoveReference(const int theIndex)
 {
   RemoveReferenceObject( 0, theIndex );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_Image::ClearReferences()
 {
   ClearReferenceObjects( 0 );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 void HYDROData_Image::SetOperatorName( const QString theOpName )
 {
   TCollection_AsciiString anAsciiStr( theOpName.toStdString().c_str() );
   TDataStd_AsciiString::Set( myLab.FindChild( DataTag_Operator ), anAsciiStr );
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 QString HYDROData_Image::OperatorName() const
@@ -854,7 +862,7 @@ QString HYDROData_Image::OperatorName() const
 void HYDROData_Image::SetArgs(const QByteArray& theArgs)
 {
   SaveByteArray(DataTag_Operator, theArgs.constData(), theArgs.length());
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 QByteArray HYDROData_Image::Args() const
@@ -873,7 +881,7 @@ void HYDROData_Image::SetIsSelfSplitted(bool theFlag)
   } else {
     myLab.ForgetAttribute(GUID_SELF_SPLITTED);
   }
-  SetToUpdate( true );
+  Changed( Geom_2d );
 }
 
 bool HYDROData_Image::IsSelfSplitted() const