From: asl <asl@opencascade.com>
Date: Thu, 15 Oct 2015 13:43:57 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP
X-Git-Tag: v1.5~109^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e744ba34fd38d6744d11b54cd15b6f86350695b2;p=modules%2Fhydro.git

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
---

e744ba34fd38d6744d11b54cd15b6f86350695b2
diff --cc src/HYDROData/HYDROData_Entity.cxx
index 1ff7379a,1cb4d0f3..ceea46b6
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@@ -37,24 -38,6 +37,22 @@@
  #include <QStringList>
  #include <QVariant>
  
 +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 )
 +{
 +}
 +
 +
- static const Standard_GUID GUID_MUST_BE_UPDATED("80f2bb81-3873-4631-8ddd-940d2119f000");
- 
  IMPLEMENT_STANDARD_HANDLE(HYDROData_Entity,MMgt_TShared)
  IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Entity,MMgt_TShared)
  
diff --cc src/HYDROData/HYDROData_Entity.h
index d7ad12cb,4e6e5f09..21f14e4a
--- a/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_ImmersibleZone.cxx
index 3e54c045,9b0cfdd8..f3c54679
--- a/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_StricklerTable.cxx
index 13a6e529,5d7623d8..9a583a94
--- a/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 )
  {
  }