X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ImmersibleZone.cxx;h=f3c5467998e8856aab51eec0e77e7d4231fda73e;hb=0b8b69a9ad7c8c3340c4a828c7f96cb9455d7df9;hp=eb3ae96669cf873e4ab86daa31ea92a30c380084;hpb=2d99821157e770385d7af917b2d22d6aa3cacb7e;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx index eb3ae966..f3c54679 100644 --- a/src/HYDROData/HYDROData_ImmersibleZone.cxx +++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx @@ -1,9 +1,28 @@ +// 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_ImmersibleZone.h" -#include "HYDROData_Bathymetry.h" +#include "HYDROData_IAltitudeObject.h" #include "HYDROData_Document.h" +#include "HYDROData_ShapesGroup.h" #include "HYDROData_PolylineXY.h" +#include "HYDROData_ShapesTool.h" #include @@ -13,13 +32,16 @@ #include #include #include + #include #include #include + +#include + #include #include -#define PYTHON_IMMERSIBLE_ZONE_ID "KIND_IMMERSIBLE_ZONE" //#define HYDRODATA_IMZONE_DEB 1 IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject) @@ -27,7 +49,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject) HYDROData_ImmersibleZone::HYDROData_ImmersibleZone() -: HYDROData_NaturalObject() +: HYDROData_NaturalObject( Geom_2d ) { } @@ -37,41 +59,21 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone() QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; - - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + + QString aZoneName = GetObjPyName(); - QString aDocName = aDocument->GetDocPyName(); - QString aZoneName = GetName(); + Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject(); + setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" ); - aResList << QString( "%1 = %2.CreateObject( %3 );" ) - .arg( aZoneName ).arg( aDocName ).arg( PYTHON_IMMERSIBLE_ZONE_ID ); - aResList << QString( "%1.SetName( \"%2\" );" ) - .arg( aZoneName ).arg( aZoneName ); - aResList << QString( "" ); + Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline(); + setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" ); - QColor aFillingColor = GetFillingColor(); - aResList << QString( "filling_color = QColor( %1, %2, %3, %4 );" ) - .arg( aFillingColor.red() ).arg( aFillingColor.green() ) - .arg( aFillingColor.blue() ).arg( aFillingColor.alpha() ); - aResList << QString( "%1.SetFillingColor( filling_color );" ).arg( aZoneName ); aResList << QString( "" ); - QColor aBorderColor = GetBorderColor(); - aResList << QString( "border_color = QColor( %1, %2, %3, %4 );" ) - .arg( aBorderColor.red() ).arg( aBorderColor.green() ) - .arg( aBorderColor.blue() ).arg( aBorderColor.alpha() ); - aResList << QString( "%1.SetBorderColor( border_color );" ).arg( aZoneName ); + aResList << QString( "%1.Update();" ).arg( aZoneName ); aResList << QString( "" ); - Handle(HYDROData_Bathymetry) aRefBathymetry = GetBathymetry(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetBathymetry" ); - - Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" ); - return aResList; } @@ -86,24 +88,30 @@ HYDROData_SequenceOfObjects HYDROData_ImmersibleZone::GetAllReferenceObjects() c return aResSeq; } -TopoDS_Shape HYDROData_ImmersibleZone::GetTopShape() const -{ - return getTopShape(); -} - void HYDROData_ImmersibleZone::Update() { HYDROData_NaturalObject::Update(); TopoDS_Shape aResShape = generateTopShape(); SetTopShape( aResShape ); + + createGroupObjects(); +} + +bool HYDROData_ImmersibleZone::IsHas2dPrs() const +{ + return true; } 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(); @@ -116,89 +124,133 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const BRepBuilderAPI_MakeFace aMakeFace( aPolylineWire, Standard_True ); aMakeFace.Build(); if( aMakeFace.IsDone() ) { - return aMakeFace.Face(); + aResultFace = aMakeFace.Face(); } } } else { - 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 - } - } + 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 aResultFace; + + 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 aResultFace; + + 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()) { + for (; aFR.More(); aFR.Next()) { + aResultFace = aFR.Current(); + break; + } + } + } } - return aResShape; -} -TopoDS_Shape HYDROData_ImmersibleZone::GetShape3D() const -{ - return getTopShape(); + if( aResultFace.IsNull() ) + return aResultFace; + + BRepCheck_Analyzer anAnalyzer( aResultFace ); + if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE ) + return aResultFace; + else + return TopoDS_Face(); } -QColor HYDROData_ImmersibleZone::DefaultFillingColor() +void HYDROData_ImmersibleZone::createGroupObjects() { - return QColor( Qt::darkBlue ); + TopoDS_Shape aZoneShape = GetTopShape(); + + // Temporary solution while the restriction for polylines is not implemented + // and shape for zone can be compound and not face only + if ( !aZoneShape.IsNull() && aZoneShape.ShapeType() != TopAbs_FACE ) + { + TopExp_Explorer aZoneFaceExp( aZoneShape, TopAbs_FACE ); + if ( aZoneFaceExp.More() ) + aZoneShape = aZoneFaceExp.Current(); // Take only first face into account + } + + if ( aZoneShape.IsNull() || aZoneShape.ShapeType() != TopAbs_FACE ) + return; + + TopoDS_Face aZoneFace = TopoDS::Face( aZoneShape ); + + TopoDS_Wire aZoneOuterWire = ShapeAnalysis::OuterWire( aZoneFace ); + + // 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() ) + { + TopoDS_Wire aZoneWire = TopoDS::Wire( aZoneFaceExp.Current() ); + if ( aZoneWire.IsEqual( aZoneOuterWire ) ) + continue; // Skip the outer wire + + TopTools_SequenceOfShape anInnerEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aZoneWire, TopAbs_EDGE, anInnerEdges ); + if ( anInnerEdges.IsEmpty() ) + continue; + + QString anInWiresGroupName = GetName() + "_Inner_" + QString::number( anInnerCounter++ ); + + Handle(HYDROData_ShapesGroup) anInWiresGroup = createGroupObject(); + anInWiresGroup->SetName( anInWiresGroupName ); + + anInWiresGroup->SetShapes( anInnerEdges ); + } } -QColor HYDROData_ImmersibleZone::DefaultBorderColor() +TopoDS_Shape HYDROData_ImmersibleZone::GetShape3D() const { - return QColor( Qt::transparent ); + return GetTopShape(); } -QColor HYDROData_ImmersibleZone::getDefaultFillingColor() const +QColor HYDROData_ImmersibleZone::DefaultFillingColor() const { - return DefaultFillingColor(); + return QColor( Qt::darkBlue ); } -QColor HYDROData_ImmersibleZone::getDefaultBorderColor() const +QColor HYDROData_ImmersibleZone::DefaultBorderColor() const { - return DefaultBorderColor(); + return QColor( Qt::transparent ); } void HYDROData_ImmersibleZone::SetPolyline( const Handle(HYDROData_PolylineXY)& thePolyline ) { + if( IsEqual( GetPolyline(), thePolyline ) ) + return; + SetReferenceObject( thePolyline, DataTag_Polyline ); - SetToUpdate( true ); + Changed( Geom_2d ); } Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const @@ -210,7 +262,5 @@ Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const void HYDROData_ImmersibleZone::RemovePolyline() { ClearReferenceObjects( DataTag_Polyline ); - SetToUpdate( true ); + Changed( Geom_2d ); } - -