debug of tests for DTM

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

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 0cbb266d27f1f5388730078fb6768ac00ee58b67..698cfc944925502b5744e9ae3adc281bc39b5523 100644 (file)
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -44,6 +44,7 @@
 #include <ShapeUpgrade_UnifySameDomain.hxx>
 
 #include <QStringList>
+#include <QColor>
 
 //#define DEB_GET_REGION_SHAPE
 
@@ -52,7 +53,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Region, HYDROData_Entity)
 
 
 HYDROData_Region::HYDROData_Region()
- : HYDROData_Entity()
+ : HYDROData_Entity( Geom_2d )
 {
 }
 
@@ -107,7 +108,7 @@ bool HYDROData_Region::AddZone( const Handle(HYDROData_Zone)& theZone )
   if ( !aFatherRegion.IsNull() && aFatherRegion->Label() != myLab )
   {
     Handle(HYDROData_Zone) aNewZone = addNewZone( aDocument, "", TopoDS_Face(), QStringList() );
-    theZone->CopyTo( aNewZone );
+    theZone->CopyTo( aNewZone, false );
 
     // To prevent changing of stored shape
     aNewZone->SetShape( theZone->GetShape() );
@@ -174,12 +175,11 @@ Handle(HYDROData_Zone) HYDROData_Region::addNewZone( const Handle(HYDROData_Docu
   for ( int i = 0, n = theRefObjects.length(); i < n; ++i )
   {
     const QString& anObjName = theRefObjects.at( i );
-    Handle(HYDROData_Object) aRefObject = 
-      Handle(HYDROData_Object)::DownCast( theDoc->FindObjectByName( anObjName ) );
+    Handle(HYDROData_Entity) aRefObject = theDoc->FindObjectByName( anObjName );
     if ( aRefObject.IsNull() )
       continue;
 
-    aNewZone->AddGeometryObject( aRefObject );
+    aNewZone->AddObject( aRefObject );
   }
 
   return aNewZone;
@@ -389,12 +389,14 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs*
   return aResShape;
 }
 
-QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_Region::DumpToPython( const QString&       thePyScriptPath,
+                                            MapOfTreatedObjects& theTreatedObjects,
+                                            QString              defRegName ) const
 {
   QStringList aResList;
 
   // Find region
-  findPythonReferenceObject( theTreatedObjects, aResList );
+  findPythonReferenceObject( aResList, defRegName );
 
   // Add zones
   HYDROData_SequenceOfObjects aZones = GetZones();
@@ -407,12 +409,12 @@ QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
     }
     
     // find zone
-    aZone->findPythonReferenceObject( theTreatedObjects, aResList );
+    aZone->findPythonReferenceObject( aResList );
     theTreatedObjects.insert( aZone->GetName(), aZone );
     
     // set zone merge type
     QString aMergeTypeStr;
-    HYDROData_Zone::MergeAltitudesType aMergeType = aZone->GetMergeType();
+    HYDROData_Zone::MergeType aMergeType = aZone->GetMergeType();
     if ( aMergeType == HYDROData_Zone::Merge_ZMIN ) {
       aMergeTypeStr = "HYDROData_Zone.Merge_ZMIN";
     } else if ( aMergeType == HYDROData_Zone::Merge_ZMAX ) {
@@ -425,16 +427,20 @@ QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
       aResList << QString( "%1.SetMergeType( %2 )" ).arg( aZone->GetObjPyName() ).arg( aMergeTypeStr );
     }
     if ( aMergeType == HYDROData_Zone::Merge_Object ) {
-      Handle(HYDROData_IAltitudeObject) aMergeAltitude = aZone->GetMergeAltitude();
-      if ( !aMergeAltitude.IsNull() ) {
-        aMergeAltitude->findPythonReferenceObject( theTreatedObjects, aResList );
-        aResList << QString( "%1.SetMergeAltitude( %2 )" ).arg( aZone->GetObjPyName() )
-                                                          .arg( aMergeAltitude->GetObjPyName() );
+      Handle(HYDROData_Entity) aMergeObject = aZone->GetMergeObject();
+      if ( !aMergeObject.IsNull() ) {
+        aMergeObject->findPythonReferenceObject( aResList );
+        aResList << QString( "%1.SetMergeObject( %2 )" ).arg( aZone->GetObjPyName() )
+                                                        .arg( aMergeObject->GetObjPyName() );
       }
     }
-
+    // set color
+    QColor zoneColor = aZone->GetColor(Qt::darkBlue);
+    aResList << QString( "%1.SetColor( QColor( %2, %3, %4 ))" )
+                 .arg( aZone->GetObjPyName() ).arg( zoneColor.red() ).arg( zoneColor.green() ).arg( zoneColor.blue() );
     // add zone
-    setPythonReferenceObject( theTreatedObjects, aResList, aZone, "AddZone" );
+    setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aZone, "AddZone" );
+
   }
 
   return aResList;