X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Region.cxx;h=0f47ed2a50be6d5535d179b5b4b8d11344d0b180;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=45d7b9e7149cb7a66bf811c12685be9e897815c1;hpb=9d657ba909dc1123967fae5790115866b406197c;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx index 45d7b9e7..0f47ed2a 100644 --- a/src/HYDROData/HYDROData_Region.cxx +++ b/src/HYDROData/HYDROData_Region.cxx @@ -1,3 +1,20 @@ +// Copyright (C) 2014-2015 EDF-R&D +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "HYDROData_Region.h" @@ -21,21 +38,26 @@ #include #include + #include #include #include #include +#include + +#include "Geom_Plane.hxx" +#include "gp_Pln.hxx" +#include "BRepTools_ReShape.hxx" //#define DEB_GET_REGION_SHAPE -IMPLEMENT_STANDARD_HANDLE(HYDROData_Region, HYDROData_Entity) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Region, HYDROData_Entity) HYDROData_Region::HYDROData_Region() - : HYDROData_Entity() + : HYDROData_Entity( Geom_2d ) { } @@ -90,7 +112,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() ); @@ -157,12 +179,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; @@ -222,7 +243,9 @@ void getUsedGroups( const TopoDS_Shape& theShape, } } -TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups ) const + + +TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups, const TopTools_SequenceOfShape* IntSh ) const { HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroups; HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfUsedGroups; @@ -243,6 +266,9 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* HYDROData_SequenceOfObjects aZones = GetZones(); HYDROData_SequenceOfObjects::Iterator aZoneIter( aZones ); + TopTools_IndexedMapOfShape AllE; + TopTools_IndexedMapOfShape IE; //int edges + for ( ; aZoneIter.More(); aZoneIter.Next() ) { Handle(HYDROData_Zone) aZone = @@ -256,19 +282,25 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* TopoDS_Face aZoneFace = TopoDS::Face( aZoneShape ); aRegionFacesList.Append( aZoneFace ); - + TopExp::MapShapes(aZoneFace, TopAbs_EDGE, AllE); // collect all edges getUsedGroups( aZoneFace, aSeqOfGroups, aSeqOfUsedGroups ); } // zones iterator + + for (int i = 1; i <= IntSh->Length(); i++) + { + const TopoDS_Shape& CS = (*IntSh)(i); + if (AllE.Contains(CS)) + IE.Add(CS); + } if ( aRegionFacesList.IsEmpty() ) return aResShape; - // The unite region face TopoDS_Face aRegionFace; if ( aRegionFacesList.Extent() == 1 ) { - aRegionFace = TopoDS::Face( aRegionFacesList.First() ); + aResShape = TopoDS::Face( aRegionFacesList.First() ); } else { @@ -295,6 +327,35 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* } aFuseShape = aFuse.Shape(); + + //update history of internal edges + TopTools_IndexedMapOfShape DIE; + TopTools_ListOfShape newSh1, newSh2; + for (int i = 1; i <= IE.Extent(); i++) + { + const TopoDS_Shape& CSH = IE(i); + newSh1.Clear(); + newSh2.Clear(); + newSh1 = aFuse.Modified(CSH); + if (newSh1.IsEmpty()) + { + newSh2 = aFuse.Generated(CSH); + if (newSh2.IsEmpty()) + DIE.Add(CSH); + else + for (TopTools_ListIteratorOfListOfShape lt(newSh2); lt.More(); lt.Next()) + if (!lt.Value().IsNull()) + DIE.Add(lt.Value()); + } + else + { + for (TopTools_ListIteratorOfListOfShape lt(newSh1); lt.More(); lt.Next()) + if (!lt.Value().IsNull()) + DIE.Add(lt.Value()); + } + } + IE = DIE; + //update groups HYDROData_ShapesGroup::GroupDefinition::Update( &aSeqOfUsedGroups, &aFuse ); } // faces iterator @@ -302,82 +363,97 @@ TopoDS_Shape HYDROData_Region::GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Fused face edges:", aFuseShape, TopAbs_EDGE ); #endif - // Check the result of fuse operation - if ( !aFuseShape.IsNull() ) + BRep_Builder BB; + TopoDS_Face DF; + if (!IE.IsEmpty()) { - ShapeUpgrade_UnifySameDomain anUnifier( aFuseShape ); - anUnifier.Build(); + //add dummy face to existing shell + //this face contains all internal edges + //USD algo will skip such edges and will not perform unifying through them + //(more than 2 faces are connected to one edge + non same domain surfaces) + TopoDS_Wire DW; + Handle_Geom_Plane DPl = new Geom_Plane(gp_Pln (gp_Pnt(0,0,0), gp_Dir(0,1,0))); //non same domain with the main surf + BB.MakeFace(DF, DPl, Precision::Confusion()); + BB.MakeWire(DW); + for (int i = 1; i <= IE.Extent(); i++) + BB.Add(DW, IE(i)); + BB.Add(DF, DW); + BB.Add(aFuseShape, DF); + } - const TopoDS_Shape& anUnitedShape = anUnifier.Shape(); + ShapeUpgrade_UnifySameDomain unif( aFuseShape ); + unif.Build(); + TopoDS_Shape anUnitedShape; + const TopoDS_Shape& out = unif.Shape(); - TopTools_SequenceOfShape aShapeFaces; - HYDROData_ShapesTool::ExploreShapeToShapes( anUnitedShape, TopAbs_FACE, aShapeFaces ); - if ( aShapeFaces.Length() == 1 ) - { - aRegionFace = TopoDS::Face( aShapeFaces.Value( 1 ) ); + HYDROData_ShapesGroup::GroupDefinition::Update( &aSeqOfUsedGroups, &unif ); -#ifdef DEB_GET_REGION_SHAPE - HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Result face edges:", aRegionFace, TopAbs_EDGE ); -#endif + if (!IE.IsEmpty()) + { + //remove dummy face from shell; shell becomes valid + const TopoDS_Shape& NDF = unif.Generated(DF); + BRepTools_ReShape ReShaper; + ReShaper.Remove(NDF); + anUnitedShape = ReShaper.Apply(out); + HYDROData_ShapesGroup::GroupDefinition::Update( &aSeqOfUsedGroups, &ReShaper ); + } + else + anUnitedShape = out; - HYDROData_ShapesGroup::GroupDefinition::Update( &aSeqOfUsedGroups, &anUnifier ); + TopTools_SequenceOfShape aShapeFaces; + HYDROData_ShapesTool::ExploreShapeToShapes( anUnitedShape, TopAbs_FACE, aShapeFaces ); + if ( aShapeFaces.Length() == 1 ) //it should be either face or compound of faces (?) + { + const TopoDS_Face& CF = TopoDS::Face( aShapeFaces.Value( 1 )); + aResShape = CF; + } + else + { + TopTools_SequenceOfShape aShapeShells; + HYDROData_ShapesTool::ExploreShapeToShapes( anUnitedShape, TopAbs_SHELL, aShapeShells ); + if (aShapeShells.Length() == 1) + aResShape = TopoDS::Shell(aShapeShells(1)); + else + aResShape = anUnitedShape; + } + + // Update the sequence of groups + if ( theSeqOfGroups ) + { + HYDROData_ShapesGroup::SeqOfGroupsDefs::Iterator aUsedIter( aSeqOfUsedGroups ); + for ( ; aUsedIter.More(); aUsedIter.Next() ) + { + const HYDROData_ShapesGroup::GroupDefinition& aUsedGroupDef = aUsedIter.Value(); + if ( aUsedGroupDef.Shapes.IsEmpty() ) + continue; - // Update the sequence of groups - if ( theSeqOfGroups ) + HYDROData_ShapesGroup::SeqOfGroupsDefs::Iterator anOriIter( aSeqOfGroups ); + for ( ; anOriIter.More(); anOriIter.Next() ) { - HYDROData_ShapesGroup::SeqOfGroupsDefs::Iterator aUsedIter( aSeqOfUsedGroups ); - for ( ; aUsedIter.More(); aUsedIter.Next() ) - { - const HYDROData_ShapesGroup::GroupDefinition& aUsedGroupDef = aUsedIter.Value(); - if ( aUsedGroupDef.Shapes.IsEmpty() ) - continue; - - HYDROData_ShapesGroup::SeqOfGroupsDefs::Iterator anOriIter( aSeqOfGroups ); - for ( ; anOriIter.More(); anOriIter.Next() ) - { - HYDROData_ShapesGroup::GroupDefinition& anOriGroupDef = anOriIter.ChangeValue(); - if ( anOriGroupDef.Name != aUsedGroupDef.Name ) - continue; - - HYDROData_ShapesTool::AddShapes( anOriGroupDef.Shapes, aUsedGroupDef.Shapes ); - break; - } - } - - *theSeqOfGroups = aSeqOfGroups; + HYDROData_ShapesGroup::GroupDefinition& anOriGroupDef = anOriIter.ChangeValue(); + if ( anOriGroupDef.Name != aUsedGroupDef.Name ) + continue; + + HYDROData_ShapesTool::AddShapes( anOriGroupDef.Shapes, aUsedGroupDef.Shapes ); + break; } } - } - } - if ( !aRegionFace.IsNull() ) - { - // result shape is a face - aResShape = aRegionFace; + *theSeqOfGroups = aSeqOfGroups; + } } - 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; } -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(); @@ -390,12 +466,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 ) { @@ -408,17 +484,35 @@ 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; -} \ No newline at end of file +} + +bool HYDROData_Region::IsSubmersible() const +{ + HYDROData_SequenceOfObjects aZones = GetZones(); + HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones ); + for ( ; aZonesIter.More(); aZonesIter.Next() ) + { + Handle(HYDROData_Zone) aZone = + Handle(HYDROData_Zone)::DownCast( aZonesIter.Value() ); + if ( !aZone->IsSubmersible() ) + return false; //if one of zones is not submersible the region is considered as not submersible + } + return true; +}