X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Region.cxx;h=090171f9e8b09619801de27ad7976baa15c1c306;hb=05ee2a655d95a8c87467aa8f4a7938af7d6fd7ed;hp=10275833185f1117fdfa734c460b8f0e369a6235;hpb=8538df60dfaeb61e0e44362e20d359747cdae923;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 10275833..090171f9 100644
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -1,10 +1,23 @@
 
 #include "HYDROData_Region.h"
 
+#include "HYDROData_CalculationCase.h"
 #include "HYDROData_Document.h"
 #include "HYDROData_Iterator.h"
 #include "HYDROData_Zone.h"
 
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Shell.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
+#include <TopExp.hxx>
+#include <BRep_Builder.hxx>
+#include <BRepAlgoAPI_Fuse.hxx>
+#include <ShapeUpgrade_UnifySameDomain.hxx>
+
 #include <QStringList>
 
 #define PYTHON_REGION_ID "KIND_REGION"
@@ -26,7 +39,7 @@ QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
 {
   QStringList aResList;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( this );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
   if ( aDocument.IsNull() )
     return aResList;
 
@@ -53,7 +66,18 @@ QStringList HYDROData_Region::DumpToPython( MapOfTreatedObjects& theTreatedObjec
   return aResList;
 }
 
-bool HYDROData_Region::AddZone( Handle(HYDROData_Zone)& theZone )
+void HYDROData_Region::Remove()
+{
+  Handle(HYDROData_CalculationCase) aFatherCalc = 
+    Handle(HYDROData_CalculationCase)::DownCast( GetFatherObject() );
+
+  HYDROData_Entity::Remove();
+
+  if ( !aFatherCalc.IsNull() )
+    aFatherCalc->UpdateRegionsOrder();
+}
+
+bool HYDROData_Region::AddZone( const Handle(HYDROData_Zone)& theZone )
 {
   if ( theZone.IsNull() )
     return false;
@@ -66,15 +90,18 @@ bool HYDROData_Region::AddZone( Handle(HYDROData_Zone)& theZone )
     Handle(HYDROData_Region)::DownCast( theZone->GetFatherObject() );
   if ( !aFatherRegion.IsNull() && aFatherRegion->Label() != myLab )
   {
-    Handle(HYDROData_Zone) aNewZone = AddNewZone();
+    Handle(HYDROData_Zone) aNewZone = addNewZone();
     theZone->CopyTo( aNewZone );
 
     aFatherRegion->RemoveZone( theZone );
 
-    theZone = aNewZone;
+    theZone->SetLabel( aNewZone->Label() );
+  }
+  else
+  {
+    AddReferenceObject( theZone, DataTag_Zone );
   }
 
-  AddReferenceObject( theZone, DataTag_Zone );
   return true;
 }
 
@@ -85,24 +112,32 @@ HYDROData_SequenceOfObjects HYDROData_Region::GetZones() const
 
 void HYDROData_Region::RemoveZone( const Handle(HYDROData_Zone)& theZone )
 {
-  if ( theZone.IsNull() || !HasReference( theZone, DataTag_Zone ) )
+  if ( theZone.IsNull() )
     return;
 
   RemoveReferenceObject( theZone->Label(), DataTag_Zone );
 
   // Remove zone from data model
-  theZone->Remove();
+  Handle(HYDROData_Region) aFatherRegion = 
+    Handle(HYDROData_Region)::DownCast( theZone->GetFatherObject() );
+  if ( !aFatherRegion.IsNull() && aFatherRegion->Label() == myLab )
+    theZone->Remove();
+
+  // If the last zone has been removed from region we remove this region
+  HYDROData_SequenceOfObjects aRefZones = GetZones();
+  if ( aRefZones.IsEmpty() )
+    Remove();
 }
 
 void HYDROData_Region::RemoveZones()
 {
   ClearReferenceObjects( DataTag_Zone );
-  myLab.FindChild( ChildTag_Zone ).ForgetAllAttributes( true );
+  myLab.FindChild( DataTag_ChildZone ).ForgetAllAttributes( true );
 }
 
-Handle(HYDROData_Zone) HYDROData_Region::AddNewZone()
+Handle(HYDROData_Zone) HYDROData_Region::addNewZone()
 {
-  TDF_Label aNewLab = myLab.FindChild( ChildTag_Zone ).NewChild();
+  TDF_Label aNewLab = myLab.FindChild( DataTag_ChildZone ).NewChild();
 
   Handle(HYDROData_Zone) aNewZone =
     Handle(HYDROData_Zone)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_ZONE ) );
@@ -111,3 +146,86 @@ Handle(HYDROData_Zone) HYDROData_Region::AddNewZone()
   return aNewZone;
 }
 
+TopoDS_Shape HYDROData_Region::GetShape() const
+{
+  TopoDS_Shape aResShape;
+
+  // Unite the region zones (each zone is a face) into one face (united face)
+  // If the zones can't be united into the single face - unite them into shell
+
+  // Collect the list of region faces
+  TopTools_ListOfShape aRegionFacesList;
+
+  HYDROData_SequenceOfObjects aZones = GetZones();
+  HYDROData_SequenceOfObjects::Iterator aZoneIter( aZones );
+  for ( ; aZoneIter.More(); aZoneIter.Next() ) {
+    Handle(HYDROData_Zone) aZone =
+      Handle(HYDROData_Zone)::DownCast( aZoneIter.Value() );
+  
+    if ( aZone.IsNull() ) {
+      continue;
+    }
+
+    TopoDS_Face aFace = TopoDS::Face( aZone->GetShape() );
+    if ( !aFace.IsNull() ) {
+      aRegionFacesList.Append( aFace );
+    }
+  } // zones iterator
+  
+  // Check number of faces
+  int aNbFaces = aRegionFacesList.Extent();
+  if ( aNbFaces > 0 ) {
+    // The unite region face
+    TopoDS_Face aRegionFace;
+  
+    if ( aNbFaces == 1 ) {
+      aRegionFace = TopoDS::Face( aRegionFacesList.First() );
+    } else {
+      // Fuse faces into one
+      TopoDS_Shape aFuseShape;
+      TopTools_ListIteratorOfListOfShape aFaceIter( aRegionFacesList );
+      for ( ; aFaceIter.More(); aFaceIter.Next() ) {
+        if ( aFuseShape.IsNull() ) {
+          aFuseShape = aFaceIter.Value();
+        } else {
+          BRepAlgoAPI_Fuse aFuse(aFuseShape, aFaceIter.Value());
+          if ( !aFuse.IsDone() ) {
+            aFuseShape.Nullify();
+            break;
+          }
+          aFuseShape = aFuse.Shape();
+        }
+      } // faces iterator
+
+      // Check the result of fuse operation
+      if ( !aFuseShape.IsNull() ) {
+        ShapeUpgrade_UnifySameDomain anUnifier( aFuseShape );
+        anUnifier.Build();
+        TopoDS_Shape anUnitedShape = anUnifier.Shape();
+
+        TopTools_IndexedMapOfShape aMapOfFaces;
+        TopExp::MapShapes( anUnitedShape, TopAbs_FACE, aMapOfFaces );
+        if ( aMapOfFaces.Extent() == 1 ) {
+          aRegionFace = TopoDS::Face( aMapOfFaces(1) );
+        }
+      }
+    }
+
+    if ( !aRegionFace.IsNull() ) { // result shape is a face
+      aResShape = aRegionFace;
+    } else { // result shape is a shell
+      TopoDS_Shell aShell;
+      BRep_Builder aBuilder;
+      aBuilder.MakeShell( aShell );
+
+      TopTools_ListIteratorOfListOfShape aFaceIter( aRegionFacesList );
+      for ( ; aFaceIter.More(); aFaceIter.Next() ) {
+        aBuilder.Add( aShell, aFaceIter.Value() );
+      }
+
+      aResShape = aShell;
+    }
+  }
+  
+  return aResShape;
+}