Refs #289 - Spline profile is represented in OCC view as polyline profile

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

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index ad7a42c37332be19cd99f66555ae18b88f4b4a19..028e666610c78d9420f8e85a519b81481d8ddd95 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -1,7 +1,7 @@
 
 #include "HYDROData_ImmersibleZone.h"
 
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_PolylineXY.h"
@@ -72,8 +72,8 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTrea
   aResList << QString( "%1.SetBorderColor( border_color );" ).arg( aZoneName );
   aResList << QString( "" );
 
-  Handle(HYDROData_Bathymetry) aRefBathymetry = GetBathymetry();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetBathymetry" );
+  Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject();
+  setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" );
 
   Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
@@ -170,6 +170,10 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_
       }
     }
   }
+
+  if( aResultFace.IsNull() )
+    return aResultFace;
+
   BRepCheck_Analyzer anAnalyzer( aResultFace );
   if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE )
     return aResultFace;
@@ -197,8 +201,17 @@ void HYDROData_ImmersibleZone::createGroupObjects()
   
   TopoDS_Wire aZoneOuterWire = ShapeAnalysis::OuterWire( aZoneFace );
 
-  TopTools_SequenceOfShape anInnerEdges;
+  // Create outer edges group
+  QString anOutWiresGroupName = GetName() + "_Outer";
+
+  Handle(HYDROData_ShapesGroup) anOutWiresGroup = createGroupObject();
+  anOutWiresGroup->SetName( anOutWiresGroupName );
+
+  TopTools_SequenceOfShape anOuterEdges;
+  HYDROData_ShapesTool::ExploreShapeToShapes( aZoneOuterWire, TopAbs_EDGE, anOuterEdges );
+  anOutWiresGroup->SetShapes( anOuterEdges );
 
+  int anInnerCounter = 1;
   TopExp_Explorer aZoneFaceExp( aZoneFace, TopAbs_WIRE );
   for ( ; aZoneFaceExp.More(); aZoneFaceExp.Next() )
   {
@@ -206,25 +219,12 @@ void HYDROData_ImmersibleZone::createGroupObjects()
     if ( aZoneWire.IsEqual( aZoneOuterWire ) )
       continue; // Skip the outer wire
 
-    TopTools_SequenceOfShape anEdges;
-    HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anEdges );
-    anInnerEdges.Append( anEdges );
-  }
-  
-  // Create outer edges group
-  QString anOutWiresGroupName = GetName() + "_Outer";
+    TopTools_SequenceOfShape anInnerEdges;
+    HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anInnerEdges );
+    if ( anInnerEdges.IsEmpty() )
+      continue;
 
-  Handle(HYDROData_ShapesGroup) anOutWiresGroup = createGroupObject();
-  anOutWiresGroup->SetName( anOutWiresGroupName );
-
-  TopTools_SequenceOfShape anEdges;
-  HYDROData_ShapesTool::ExploreShapeToShapes( aZoneOuterWire, TopAbs_EDGE, anEdges );
-  anOutWiresGroup->SetShapes( anEdges );
-
-  // Create group for inner edges only if edges is not empty
-  if ( !anInnerEdges.IsEmpty() )
-  {
-    QString anInWiresGroupName = GetName() + "_Inner";
+    QString anInWiresGroupName = GetName() + "_Inner_" + QString::number( anInnerCounter++ );
 
     Handle(HYDROData_ShapesGroup) anInWiresGroup = createGroupObject();
     anInWiresGroup->SetName( anInWiresGroupName );