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

Conflicts:
	src/HYDROData/HYDROData_Entity.cxx
	src/HYDROData/HYDROData_Object.cxx
	src/HYDROData/HYDROData_StricklerTable.cxx
	src/HYDROData/HYDROData_Tool.h

diff --cc src/HYDROData/HYDROData_CalculationCase.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Channel.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Confluence.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Entity.cxx
index 1ff7379a109902a3e447754d168767cdd58d4d15,1cb4d0f397bae3f71b75d745bd50b7e9db5da7cc..ceea46b60ff4305b7d9f45f61f3c90c129411b89
--- 1/src/HYDROData/HYDROData_Entity.cxx
--- 2/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@@ -37,24 -38,6 +37,22 @@@
  #include <QStringList>
  #include <QVariant>
  
- static const Standard_GUID GUID_MUST_BE_UPDATED("80f2bb81-3873-4631-8ddd-940d2119f000");
- 
 +HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects()
 +  : NCollection_Sequence<Handle_HYDROData_Entity>()
 +{
 +}
 +
 +HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const HYDROData_SequenceOfObjects& theSequence )
 +  : NCollection_Sequence<Handle_HYDROData_Entity>( theSequence )
 +{
 +}
 +
 +HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects( const NCollection_Sequence<Handle_HYDROData_Entity>& theSequence )
 +  : NCollection_Sequence<Handle_HYDROData_Entity>( theSequence )
 +{
 +}
 +
 +
  IMPLEMENT_STANDARD_HANDLE(HYDROData_Entity,MMgt_TShared)
  IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared)
  

diff --cc src/HYDROData/HYDROData_Entity.h
index d7ad12cb87b89ff03442f9c73996c515efb2ddfb,4e6e5f090190cd1464f353bed41d654b0d734934..21f14e4ac9daafe9f29832d610c704a6d78d79c7
--- 1/src/HYDROData/HYDROData_Entity.h
--- 2/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@@ -422,10 -420,10 +427,12 @@@ protected
  
    Handle(TDataStd_ReferenceList) getReferenceList( const int  theTag,
                                                     const bool theIsCreate ) const;
 -
 +  
 +  void SetShape( int theTag, const TopoDS_Shape& theShape );
 +  TopoDS_Shape GetShape( int theTag ) const;
  
+   int GetGeomChangeFlag() const;
+ 
  protected:
    /// Array of pointers to the properties of this object; index in this array is returned by \a AddProperty.
    TDF_Label myLab; ///< label of this object

diff --cc src/HYDROData/HYDROData_IAltitudeObject.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_IPolyline.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Image.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_ImmersibleZone.cxx
index 3e54c04522af296092e76e4a16e5da8f1cd54b70,9b0cfdd89cd567d8a1d56f5e662181252ca6fde3..f3c5467998e8856aab51eec0e77e7d4231fda73e
--- 1/src/HYDROData/HYDROData_ImmersibleZone.cxx
--- 2/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@@ -262,5 -277,7 +262,5 @@@ Handle(HYDROData_PolylineXY) HYDROData_
  void HYDROData_ImmersibleZone::RemovePolyline()
  {
    ClearReferenceObjects( DataTag_Polyline );
-   SetToUpdate( true );
+   Changed( Geom_2d );
  }
 -
 -

diff --cc src/HYDROData/HYDROData_LandCover.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_NaturalObject.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Object.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Object.h
Simple merge

diff --cc src/HYDROData/HYDROData_Obstacle.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Polyline3D.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_PolylineXY.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Profile.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_River.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_ShapesGroup.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Stream.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_StricklerTable.cxx
index 13a6e529a47284cc10aa7481f25da4e64aa834a2,5d7623d8047cedf9f153be9b5e9d86a77f25fae4..9a583a949bd8c5503f03d7dfeb7e533050357bc3
--- 1/src/HYDROData/HYDROData_StricklerTable.cxx
--- 2/src/HYDROData/HYDROData_StricklerTable.cxx
+++ b/src/HYDROData/HYDROData_StricklerTable.cxx
@@@ -32,16 -26,14 +32,17 @@@
  #include <TCollection_AsciiString.hxx>
  #include <TCollection_ExtendedString.hxx>
  
 -#include <QtCore/QString>
 -#include <QtCore/QStringList>
 +#include <QString>
 +#include <QColor>
 +#include <QStringList>
 +#include <QFile>
 +#include <QTextStream>
  
  IMPLEMENT_STANDARD_HANDLE( HYDROData_StricklerTable, HYDROData_Entity )
 -    IMPLEMENT_STANDARD_RTTIEXT( HYDROData_StricklerTable, HYDROData_Entity )
 +IMPLEMENT_STANDARD_RTTIEXT( HYDROData_StricklerTable, HYDROData_Entity )
  
  HYDROData_StricklerTable::HYDROData_StricklerTable()
+ : HYDROData_Entity( Geom_No )
  {
  }
  

diff --cc src/HYDROData/HYDROData_Tool.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_Tool.h
Simple merge

diff --cc src/HYDROData/HYDROData_Zone.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_CalculationOp.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_ChannelOp.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_ProfileOp.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_StreamOp.cxx
Simple merge