Merge branch 'BR_H2018_3' into BR_2018_V8_5

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

diff --git a/src/HYDROData/HYDROData_Document.cxx b/src/HYDROData/HYDROData_Document.cxx
index 6a8f7376402874535a0698799b981a0a1c76ccc6..c892dcd8b74b8e00d01e56afaf92aa90ccd14ebe 100644 (file)
--- a/src/HYDROData/HYDROData_Document.cxx
+++ b/src/HYDROData/HYDROData_Document.cxx
@@ -49,6 +49,8 @@ static const int TAG_OBJECTS = 2; // tag of the objects sub-tree
 static const int TAG_HISTORY = 3; // tag of the history sub-tree (Root for History)
 static const int TAG_LOCAL_CS = 4; // tag of local coordinate system information
 static const int TAG_DEF_STRICKLER_COEFF = 5; // tag of default strickler coefficient
+static const int TAG_COUNT_QUADTREE = 6; // tag of number of quadtrees created so far
+static const int TAG_COUNT_DELAUNAY = 7; // tag of number of Delaunay triangulations created so far
 static const gp_Pnt2d DEFAULT_LOCAL_CS( 0, 0 );
 
 using namespace std;
@@ -226,11 +228,73 @@ void HYDROData_Document::SetDefaultStricklerCoefficient( double theCoeff ) const
     {
         Handle(TDataStd_Real) anAttr;
         if ( !aLabel.FindAttribute( TDataStd_Real::GetID(), anAttr ) )
-            aLabel.AddAttribute( anAttr = new TDataStd_Real() );
+        {
+          anAttr = new TDataStd_Real();
+          aLabel.AddAttribute(anAttr);
+          anAttr->SetID(TDataStd_Real::GetID());
+        }
         anAttr->Set( theCoeff );
     }
 }
 
+int HYDROData_Document::GetCountQuadtree() const
+{
+  int nbQuad = 0;
+  TDF_Label aLabel = myDoc->Main().FindChild(TAG_COUNT_QUADTREE, Standard_False);
+  if ( !aLabel.IsNull() )
+  {
+      Handle(TDataStd_Integer) anAttr;
+      if ( aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
+          nbQuad = anAttr->Get();
+  }
+  return nbQuad;
+}
+
+void HYDROData_Document::SetCountQuadtree( int nbQuad) const
+{
+  TDF_Label aLabel = myDoc->Main().FindChild(TAG_COUNT_QUADTREE);
+  if ( !aLabel.IsNull() )
+  {
+      Handle(TDataStd_Integer) anAttr;
+      if ( !aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
+      {
+        anAttr = new TDataStd_Integer();
+        aLabel.AddAttribute(anAttr);
+        anAttr->SetID(TDataStd_Integer::GetID());
+        }
+      anAttr->Set( nbQuad );
+  }
+}
+
+int HYDROData_Document::GetCountDelaunay() const
+{
+  int nbDelaunay = 0;
+  TDF_Label aLabel = myDoc->Main().FindChild(TAG_COUNT_DELAUNAY, Standard_False);
+  if ( !aLabel.IsNull() )
+  {
+      Handle(TDataStd_Integer) anAttr;
+      if ( aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
+        nbDelaunay = anAttr->Get();
+  }
+  return nbDelaunay;
+}
+
+void HYDROData_Document::SetCountDelaunay( int nbDelaunay) const
+{
+  TDF_Label aLabel = myDoc->Main().FindChild(TAG_COUNT_DELAUNAY);
+  if ( !aLabel.IsNull() )
+  {
+      Handle(TDataStd_Integer) anAttr;
+      if ( !aLabel.FindAttribute( TDataStd_Integer::GetID(), anAttr ) )
+      {
+        anAttr = new TDataStd_Integer();
+        aLabel.AddAttribute(anAttr);
+        anAttr->SetID(TDataStd_Integer::GetID());
+      }
+      anAttr->Set( nbDelaunay );
+  }
+}
+
 bool HYDROData_Document::DumpToPython( const QString& thePyScriptPath,
                                        const bool     theIsMultiFile ) const
 {
@@ -270,6 +334,7 @@ bool HYDROData_Document::DumpToPython( const QString& thePyScriptPath,
   aRes = aRes && dumpPartitionToPython( aFile, thePyScriptPath, theIsMultiFile, aTreatedObjects, KIND_DIGUE );
   aRes = aRes && dumpPartitionToPython( aFile, thePyScriptPath, theIsMultiFile, aTreatedObjects, KIND_OBSTACLE );
   aRes = aRes && dumpPartitionToPython( aFile, thePyScriptPath, theIsMultiFile, aTreatedObjects, KIND_LAND_COVER_MAP );
+  aRes = aRes && dumpPartitionToPython( aFile, thePyScriptPath, theIsMultiFile, aTreatedObjects, KIND_BC_POLYGON );
   aRes = aRes && dumpPartitionToPython( aFile, thePyScriptPath, theIsMultiFile, aTreatedObjects, KIND_CALCULATION );
 
   // Dump code to close python fuction
@@ -313,8 +378,8 @@ QStringList HYDROData_Document::DumpToPython( const QString& thePyScriptPath,
   QStringList aResScript;
 
   aResScript << QString( "from HYDROPy import *" );
-  aResScript << QString( "from PyQt4.QtCore import *" );
-  aResScript << QString( "from PyQt4.QtGui import *" );
+  aResScript << QString( "from PyQt5.QtCore import *" );
+  aResScript << QString( "from PyQt5.QtGui import *" );
 
   if ( theIsMultiFile )
   {
@@ -691,6 +756,20 @@ HYDROData_SequenceOfObjects HYDROData_Document::FindObjectsByNames(
   return aResSeq;
 }
 
+HYDROData_SequenceOfObjects HYDROData_Document::CollectAllObjects( const ObjectKind theObjectKind ) const
+{
+  HYDROData_SequenceOfObjects aResSeq;
+  HYDROData_Iterator anIter( this, theObjectKind );
+  for( ; anIter.More(); anIter.Next() )
+  {
+    Handle(HYDROData_Entity) anObject = anIter.Current();
+    if( anObject.IsNull() )
+      continue;
+    aResSeq.Append( anObject );
+  }
+  return aResSeq;
+}
+
 HYDROData_Document::HYDROData_Document()
 {
   HYDROData_Application::GetApplication()->NewDocument("BinOcaf", myDoc);
@@ -724,6 +803,7 @@ int HYDROData_Document::NewID()
   Handle(TDataStd_Integer) anInt;
   if (!anIDLab.FindAttribute(TDataStd_Integer::GetID(), anInt)) {
     anInt = TDataStd_Integer::Set(anIDLab, 0);
+    anInt->SetID(TDataStd_Integer::GetID());
   }
   // just increment value and return
   anInt->Set(anInt->Get() + 1);
@@ -766,7 +846,10 @@ void HYDROData_Document::SetLocalCS( double theLX, double theLY )
   TDF_Label aLocalCSLab = LabelOfLocalCS();
   Handle( TDataXtd_Position ) aLocalCS;
   if( !aLocalCSLab.FindAttribute( TDataXtd_Position::GetID(), aLocalCS ) )
+  {
     aLocalCS = TDataXtd_Position::Set( aLocalCSLab );
+    aLocalCS->SetID(TDataXtd_Position::GetID());
+  }
 
   gp_Pnt aLocalCS3d( theLX, theLY, 0 );
   aLocalCS->SetPosition( aLocalCS3d );