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 29bc3a6d34c8f5627b9885830ad99a4e8f5bd98a..028e666610c78d9420f8e85a519b81481d8ddd95 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -1,11 +1,11 @@
 
 #include "HYDROData_ImmersibleZone.h"
 
-#include "HYDROData_Bathymetry.h"
+#include "HYDROData_IAltitudeObject.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_ShapesGroup.h"
 #include "HYDROData_PolylineXY.h"
-#include "HYDROData_Tool.h"
+#include "HYDROData_ShapesTool.h"
 
 #include <BRepBuilderAPI_MakeFace.hxx>
 
@@ -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" );
@@ -109,9 +109,13 @@ void HYDROData_ImmersibleZone::Update()
 
 TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
 {
-  TopoDS_Shape aResShape = TopoDS_Face();
+  return generateTopShape( GetPolyline() );
+}
+
+TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_PolylineXY)& aPolyline )
+{
+  TopoDS_Face aResultFace = TopoDS_Face();
 
-  Handle(HYDROData_PolylineXY) aPolyline = GetPolyline();
   if( !aPolyline.IsNull() )
   {
     TopoDS_Shape aPolylineShape = aPolyline->GetShape();
@@ -136,7 +140,8 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
         }
       }
       if(aWiresList.IsEmpty())
-         return aResShape;
+         return aResultFace;
+
       BRepAlgo_FaceRestrictor aFR;
       TopoDS_Face aRefFace;      
       TopoDS_Shape aS = aWiresList.First();
@@ -146,7 +151,8 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
         aRefFace = aMakeFace.Face();
       }
       if(aRefFace.IsNull())
-        return aResShape;
+        return aResultFace;
+
       aFR.Init(aRefFace,Standard_False, Standard_True);
       TopTools_ListIteratorOfListOfShape anIt( aWiresList );
       for ( ; anIt.More(); anIt.Next() ) {
@@ -157,25 +163,22 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
       }
       aFR.Perform();
       if (aFR.IsDone()) {
-        TopoDS_Compound aResult;
-        BRep_Builder aBB;
-        aBB.MakeCompound(aResult);
         for (; aFR.More(); aFR.Next()) {
-          const TopoDS_Face& aFF = aFR.Current();
-          aBB.Add(aResult,aFF);
-        }
-        BRepCheck_Analyzer aChecker(aResult);
-        if(aChecker.IsValid())
-          aResShape = aResult;
-#ifdef HYDRODATA_IMZONE_DEB
-        else {
-          aResShape = aResult;
+          aResultFace = aFR.Current();
+          break;
         }
-#endif
       }
     }
   }
-  return aResShape;
+
+  if( aResultFace.IsNull() )
+    return aResultFace;
+
+  BRepCheck_Analyzer anAnalyzer( aResultFace );
+  if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE )
+    return aResultFace;
+  else
+    return TopoDS_Face();
 }
 
 void HYDROData_ImmersibleZone::createGroupObjects()
@@ -198,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() )
   {
@@ -207,25 +219,12 @@ void HYDROData_ImmersibleZone::createGroupObjects()
     if ( aZoneWire.IsEqual( aZoneOuterWire ) )
       continue; // Skip the outer wire
 
-    TopTools_SequenceOfShape anEdges;
-    HYDROData_Tool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anEdges );
-    anInnerEdges.Append( anEdges );
-  }
-  
-  // Create outer edges group
-  QString anOutWiresGroupName = GetName() + "_Outer_Wire";
-
-  Handle(HYDROData_ShapesGroup) anOutWiresGroup = createGroupObject();
-  anOutWiresGroup->SetName( anOutWiresGroupName );
+    TopTools_SequenceOfShape anInnerEdges;
+    HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anInnerEdges );
+    if ( anInnerEdges.IsEmpty() )
+      continue;
 
-  TopTools_SequenceOfShape anEdges;
-  HYDROData_Tool::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_Wires";
+    QString anInWiresGroupName = GetName() + "_Inner_" + QString::number( anInnerCounter++ );
 
     Handle(HYDROData_ShapesGroup) anInWiresGroup = createGroupObject();
     anInWiresGroup->SetName( anInWiresGroupName );