17.12.2013. Added Partition algorithm (draft version).

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

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index c31dac1161c812757e326e82a4bd5052674bcc0b..eb3ae96669cf873e4ab86daa31ea92a30c380084 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -3,7 +3,7 @@
 
 #include "HYDROData_Bathymetry.h"
 #include "HYDROData_Document.h"
-#include "HYDROData_Polyline.h"
+#include "HYDROData_PolylineXY.h"
 
 #include <BRepBuilderAPI_MakeFace.hxx>
 
@@ -14,11 +14,13 @@
 #include <TopExp_Explorer.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 #include <BRep_Builder.hxx>
-
+#include <BRepAlgo_FaceRestrictor.hxx>
+#include <BRepCheck_Analyzer.hxx>
 #include <QColor>
 #include <QStringList>
 
 #define PYTHON_IMMERSIBLE_ZONE_ID "KIND_IMMERSIBLE_ZONE"
+//#define HYDRODATA_IMZONE_DEB 1
 
 IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject)
@@ -67,25 +69,49 @@ QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTrea
   Handle(HYDROData_Bathymetry) aRefBathymetry = GetBathymetry();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetBathymetry" );
 
-  Handle(HYDROData_Polyline) aRefPolyline = GetPolyline();
+  Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" );
 
   return aResList;
 }
 
+HYDROData_SequenceOfObjects HYDROData_ImmersibleZone::GetAllReferenceObjects() const
+{
+  HYDROData_SequenceOfObjects aResSeq = HYDROData_NaturalObject::GetAllReferenceObjects();
+
+  Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline();
+  if ( !aRefPolyline.IsNull() )
+    aResSeq.Append( aRefPolyline );
+
+  return aResSeq;
+}
+
 TopoDS_Shape HYDROData_ImmersibleZone::GetTopShape() const
+{
+  return getTopShape();
+}
+
+void HYDROData_ImmersibleZone::Update()
+{
+  HYDROData_NaturalObject::Update();
+  
+  TopoDS_Shape aResShape = generateTopShape();
+  SetTopShape( aResShape );
+}
+
+TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const
 {
   TopoDS_Shape aResShape = TopoDS_Face();
 
-  Handle(HYDROData_Polyline) aPolyline = GetPolyline();
+  Handle(HYDROData_PolylineXY) aPolyline = GetPolyline();
   if( !aPolyline.IsNull() )
   {
-    TopoDS_Shape aPolylineShape = aPolyline->GetTopShape();
+    TopoDS_Shape aPolylineShape = aPolyline->GetShape();
     TopTools_ListOfShape aWiresList;
 
     if ( !aPolylineShape.IsNull() && 
          aPolylineShape.ShapeType() == TopAbs_WIRE ) {
-      TopoDS_Wire aPolylineWire = TopoDS::Wire( aPolylineShape );
+      const TopoDS_Wire& aPolylineWire = TopoDS::Wire( aPolylineShape );
       if ( !aPolylineWire.IsNull() ) {
         BRepBuilderAPI_MakeFace aMakeFace( aPolylineWire, Standard_True );
         aMakeFace.Build();
@@ -94,46 +120,64 @@ TopoDS_Shape HYDROData_ImmersibleZone::GetTopShape() const
         }
       }
     } else {
-      TopExp_Explorer anExp( aPolylineShape, TopAbs_WIRE );
-      for ( ; anExp.More(); anExp.Next() ) {
-        TopoDS_Wire aWire = TopoDS::Wire( anExp.Current() );
-        aWiresList.Append( aWire );
-      }
-    }
-    
-    TopoDS_Compound aCompound;
-    BRep_Builder aBuilder;
-    aBuilder.MakeCompound( aCompound );
-
-    TopTools_ListIteratorOfListOfShape anIter( aWiresList );
-    for ( ; anIter.More(); anIter.Next() ) {
-      TopoDS_Wire aWire = TopoDS::Wire( anIter.Value() );
-      if ( aWire.IsNull() ) {
-        continue;
-      }
-
-      BRepBuilderAPI_MakeFace aMakeFace( aWire, Standard_True );
-      aMakeFace.Build();
-      if( aMakeFace.IsDone() ) {
-        aBuilder.Add( aCompound, aMakeFace.Face() );
-      }
-    }
-
-    aResShape = aCompound;
+           TopExp_Explorer anExp( aPolylineShape, TopAbs_WIRE );
+               for ( ; anExp.More(); anExp.Next() ) {
+                 if(!anExp.Current().IsNull()) {
+            const TopoDS_Wire& aWire = TopoDS::Wire( anExp.Current() );
+                   aWiresList.Append( aWire );
+                 }
+               }
+               if(aWiresList.IsEmpty())
+           return aResShape;
+           BRepAlgo_FaceRestrictor aFR;
+           TopoDS_Face aRefFace;         
+               TopoDS_Shape aS = aWiresList.First();
+               BRepBuilderAPI_MakeFace aMakeFace( TopoDS::Wire(aWiresList.First()), Standard_True );
+        aMakeFace.Build();
+        if( aMakeFace.IsDone() ) {
+          aRefFace = aMakeFace.Face();
+               }
+               if(aRefFace.IsNull())
+                 return aResShape;
+           aFR.Init(aRefFace,Standard_False, Standard_True);
+               TopTools_ListIteratorOfListOfShape anIt( aWiresList );
+        for ( ; anIt.More(); anIt.Next() ) {
+          TopoDS_Wire& aWire = TopoDS::Wire( anIt.Value() );
+                 if ( aWire.IsNull() ) 
+                         continue;
+          aFR.Add(aWire);
+               }
+        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;             
+                 }
+#endif
+               }
+       }
   }
-
   return aResShape;
 }
 
 TopoDS_Shape HYDROData_ImmersibleZone::GetShape3D() const
 {
-  // TODO
   return getTopShape();
 }
 
 QColor HYDROData_ImmersibleZone::DefaultFillingColor()
 {
-  return QColor( Qt::green );
+  return QColor( Qt::darkBlue );
 }
 
 QColor HYDROData_ImmersibleZone::DefaultBorderColor()
@@ -141,20 +185,32 @@ QColor HYDROData_ImmersibleZone::DefaultBorderColor()
   return QColor( Qt::transparent );
 }
 
-void HYDROData_ImmersibleZone::SetPolyline( const Handle(HYDROData_Polyline)& thePolyline )
+QColor HYDROData_ImmersibleZone::getDefaultFillingColor() const
+{
+  return DefaultFillingColor();
+}
+
+QColor HYDROData_ImmersibleZone::getDefaultBorderColor() const
+{
+  return DefaultBorderColor();
+}
+
+void HYDROData_ImmersibleZone::SetPolyline( const Handle(HYDROData_PolylineXY)& thePolyline )
 {
   SetReferenceObject( thePolyline, DataTag_Polyline );
+  SetToUpdate( true );
 }
 
-Handle(HYDROData_Polyline) HYDROData_ImmersibleZone::GetPolyline() const
+Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const
 {
-  return Handle(HYDROData_Polyline)::DownCast( 
+  return Handle(HYDROData_PolylineXY)::DownCast( 
            GetReferenceObject( DataTag_Polyline ) );
 }
 
 void HYDROData_ImmersibleZone::RemovePolyline()
 {
   ClearReferenceObjects( DataTag_Polyline );
+  SetToUpdate( true );
 }