X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ImmersibleZone.cxx;h=c456c8c9ce85f6629307e9871af9959abc47eadb;hb=f9d37ee66fa46871478d806faa54de237225d3c6;hp=4561fbf1b265dd17e9ef2ce76b7e8a0d574238ed;hpb=8543e637cbb4ae48998c596241fce567a729eb67;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx index 4561fbf1..c456c8c9 100644 --- a/src/HYDROData/HYDROData_ImmersibleZone.cxx +++ b/src/HYDROData/HYDROData_ImmersibleZone.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_ImmersibleZone.h" @@ -15,17 +32,23 @@ #include #include #include +#include #include #include #include #include +#include #include #include -#define PYTHON_IMMERSIBLE_ZONE_ID "KIND_IMMERSIBLE_ZONE" +#define DEB_IMZ +#include +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + //#define HYDRODATA_IMZONE_DEB 1 IMPLEMENT_STANDARD_HANDLE(HYDROData_ImmersibleZone,HYDROData_NaturalObject) @@ -33,7 +56,7 @@ IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ImmersibleZone,HYDROData_NaturalObject) HYDROData_ImmersibleZone::HYDROData_ImmersibleZone() -: HYDROData_NaturalObject() +: HYDROData_NaturalObject( Geom_2d ) { } @@ -41,43 +64,29 @@ HYDROData_ImmersibleZone::~HYDROData_ImmersibleZone() { } -QStringList HYDROData_ImmersibleZone::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_ImmersibleZone::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + + QString aZoneName = GetObjPyName(); - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; + Handle(HYDROData_IAltitudeObject) aRefAltitude = GetAltitudeObject(); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" ); - QString aDocName = aDocument->GetDocPyName(); - QString aZoneName = GetName(); + Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline(); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefPolyline, "SetPolyline" ); - 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( "" ); + if (!this->IsSubmersible()) + { + aResList << QString( "%1.SetIsSubmersible(False)" ).arg( aZoneName ); + } - 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_IAltitudeObject) aRefAltitude = GetAltitudeObject(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefAltitude, "SetAltitudeObject" ); - - Handle(HYDROData_PolylineXY) aRefPolyline = GetPolyline(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolyline" ); - return aResList; } @@ -92,11 +101,6 @@ HYDROData_SequenceOfObjects HYDROData_ImmersibleZone::GetAllReferenceObjects() c return aResSeq; } -TopoDS_Shape HYDROData_ImmersibleZone::GetTopShape() const -{ - return getTopShape(); -} - void HYDROData_ImmersibleZone::Update() { HYDROData_NaturalObject::Update(); @@ -107,6 +111,11 @@ void HYDROData_ImmersibleZone::Update() createGroupObjects(); } +bool HYDROData_ImmersibleZone::IsHas2dPrs() const +{ + return true; +} + TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const { return generateTopShape( GetPolyline() ); @@ -114,67 +123,132 @@ TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape() const TopoDS_Shape HYDROData_ImmersibleZone::generateTopShape( const Handle(HYDROData_PolylineXY)& aPolyline ) { - TopoDS_Face aResultFace = TopoDS_Face(); - - if( !aPolyline.IsNull() ) - { - TopoDS_Shape aPolylineShape = aPolyline->GetShape(); - TopTools_ListOfShape aWiresList; - - if ( !aPolylineShape.IsNull() && - aPolylineShape.ShapeType() == TopAbs_WIRE ) { - const TopoDS_Wire& aPolylineWire = TopoDS::Wire( aPolylineShape ); - if ( !aPolylineWire.IsNull() ) { - BRepBuilderAPI_MakeFace aMakeFace( aPolylineWire, Standard_True ); - aMakeFace.Build(); - if( aMakeFace.IsDone() ) { - return 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 ); + DEBTRACE("generateTopShape"); + TopoDS_Face aResultFace = TopoDS_Face(); // --- result: default = null face + + if (!aPolyline.IsNull()) + { + TopoDS_Shape aPolylineShape = aPolyline->GetShape(); +#ifdef DEB_IMZ + std::string brepName = "imz.brep"; + BRepTools::Write(aPolylineShape, brepName.c_str()); +#endif + TopTools_ListOfShape aWiresList; + + if (!aPolylineShape.IsNull() && aPolylineShape.ShapeType() == TopAbs_WIRE) + { + // --- only one wire: try to make a face + DEBTRACE("one wire: try to build a face"); + const TopoDS_Wire& aPolylineWire = TopoDS::Wire(aPolylineShape); + if (!aPolylineWire.IsNull()) + { + BRepBuilderAPI_MakeFace aMakeFace(aPolylineWire, Standard_True); + aMakeFace.Build(); + if (aMakeFace.IsDone()) + { + DEBTRACE(" a face with the only wire given"); + aResultFace = aMakeFace.Face(); + } + } } - } - 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; + else + { + // --- a list of wires ? inventory of wires and edges + Handle(TopTools_HSequenceOfShape) aSeqWires = new TopTools_HSequenceOfShape; + Handle(TopTools_HSequenceOfShape) aSeqEdges = new TopTools_HSequenceOfShape; + TopExp_Explorer anExp(aPolylineShape, TopAbs_WIRE); + DEBTRACE("list of wires ?"); + for (; anExp.More(); anExp.Next()) + { + if (!anExp.Current().IsNull()) + { + const TopoDS_Wire& aWire = TopoDS::Wire(anExp.Current()); + aWiresList.Append(aWire); + DEBTRACE(" append wire"); + TopExp_Explorer it2(aWire, TopAbs_EDGE); + for (; it2.More(); it2.Next()) + aSeqEdges->Append(it2.Current()); + } + } + if (aWiresList.IsEmpty()) + return aResultFace; // --- no wires: null result + + if (aSeqEdges->Length() > 1) + { + DEBTRACE("try to connect all the edges together, build a unique wire and a face"); + // --- try to create one wire by connecting edges with a distance tolerance (no necessity of sharing points) + ShapeAnalysis_FreeBounds::ConnectEdgesToWires(aSeqEdges, 1E-5, Standard_False, aSeqWires); + + if (aSeqWires->Length() == 1) + { + // --- one wire: try to make a face + const TopoDS_Wire& aPolylineWire = TopoDS::Wire(aSeqWires->Value(1)); + if (!aPolylineWire.IsNull()) + { + BRepBuilderAPI_MakeFace aMakeFace(aPolylineWire, Standard_True); + aMakeFace.Build(); + if (aMakeFace.IsDone()) + { + DEBTRACE(" a face from all the wires connected"); + aResultFace = aMakeFace.Face(); + } + } + } + } + + if (aResultFace.IsNull()) + { + DEBTRACE("try to make a face with the first wire of the list and other wires as restrictions"); + // --- try to make a face with the first wire of the list and other wires as restrictions + 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()) + { + DEBTRACE(" a face with first wire"); + aRefFace = aMakeFace.Face(); + } + if (!aRefFace.IsNull()) + { + 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()) + { + DEBTRACE(" a restricted face"); + aResultFace = aFR.Current(); + break; + } + } + } + } } - } } - } - BRepCheck_Analyzer anAnalyzer( aResultFace ); - if( anAnalyzer.IsValid() && aResultFace.ShapeType()==TopAbs_FACE ) + + if (aResultFace.IsNull()) return aResultFace; + + DEBTRACE("check the face"); + BRepCheck_Analyzer anAnalyzer(aResultFace); + if (anAnalyzer.IsValid() && aResultFace.ShapeType() == TopAbs_FACE) + { + DEBTRACE("face OK"); + return aResultFace; + } else - return TopoDS_Face(); + DEBTRACE("bad face"); + return TopoDS_Face(); } void HYDROData_ImmersibleZone::createGroupObjects() @@ -231,33 +305,26 @@ void HYDROData_ImmersibleZone::createGroupObjects() TopoDS_Shape HYDROData_ImmersibleZone::GetShape3D() const { - return getTopShape(); + return GetTopShape(); } -QColor HYDROData_ImmersibleZone::DefaultFillingColor() +QColor HYDROData_ImmersibleZone::DefaultFillingColor() const { return QColor( Qt::darkBlue ); } -QColor HYDROData_ImmersibleZone::DefaultBorderColor() +QColor HYDROData_ImmersibleZone::DefaultBorderColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_ImmersibleZone::getDefaultFillingColor() const -{ - return DefaultFillingColor(); -} - -QColor HYDROData_ImmersibleZone::getDefaultBorderColor() const -{ - return DefaultBorderColor(); -} - 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 @@ -269,7 +336,5 @@ Handle(HYDROData_PolylineXY) HYDROData_ImmersibleZone::GetPolyline() const void HYDROData_ImmersibleZone::RemovePolyline() { ClearReferenceObjects( DataTag_Polyline ); - SetToUpdate( true ); + Changed( Geom_2d ); } - -