X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=bf269244d08bd6abe8d4fce10332fff9432d07b7;hb=c7cf59e092fe050003d1e556715e3ac97acf6bd4;hp=15335a698575ddce2de2a7221b9660311b9f80bc;hpb=b1621e0247d3beb26d1ea81b25fca8cc9dd76c2d;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx index 15335a69..bf269244 100644 --- a/src/HYDROData/HYDROData_Channel.cxx +++ b/src/HYDROData/HYDROData_Channel.cxx @@ -1,3 +1,24 @@ +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// 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_Channel.h" @@ -13,14 +34,12 @@ #include #include #include -#include #include #include #include #include -#include //#define DEB_CHANNEL 1 #ifdef DEB_CHANNEL @@ -30,8 +49,6 @@ #include #include -#define PYTHON_CHANNEL_ID "KIND_CHANNEL" - IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject) @@ -47,22 +64,18 @@ HYDROData_Channel::~HYDROData_Channel() QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const { - QStringList aResList; + QStringList aResList = dumpObjectCreation( theTreatedObjects ); + QString aName = GetObjPyName(); - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( aDocument.IsNull() ) - return aResList; + Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine(); + setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); - QString aDocName = aDocument->GetDocPyName(); - QString aChannelName = GetName(); + Handle(HYDROData_Profile) aRefProfile = GetProfile(); + setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" ); - aResList << QString( "%1 = %2.CreateObject( %3 );" ) - .arg( aChannelName ).arg( aDocName ).arg( PYTHON_CHANNEL_ID ); - aResList << QString( "%1.SetName( \"%2\" );" ) - .arg( aChannelName ).arg( aChannelName ); aResList << QString( "" ); - - // TODO + aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "" ); return aResList; } @@ -92,58 +105,106 @@ TopoDS_Shape HYDROData_Channel::GetShape3D() const return getShape3D(); } +bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine, + const Handle(HYDROData_Profile)& theProfile, + PrsDefinition& thePrs ) +{ + if ( theGuideLine.IsNull() || theProfile.IsNull() ) + return false; + + // build 3d shape + TopoDS_Wire aPathWire = TopoDS::Wire( theGuideLine->GetShape3D() ); + TopoDS_Wire aProfileWire = TopoDS::Wire( theProfile->GetShape3D() ); + if ( aPathWire.IsNull() || aProfileWire.IsNull() ) + return false; + +#ifdef DEB_CHANNEL + BRepTools::Write( aPathWire, "guideline.brep" ); + BRepTools::Write( aProfileWire, "profile.brep" ); +#endif + + HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire ); + if( aChannelConstructor.GetStatus() != 0 ) + return false; + + aChannelConstructor.Create3dPresentation(); + aChannelConstructor.Create2dPresentation(); + thePrs.myPrs3D = aChannelConstructor.Get3dPresentation(); + thePrs.myPrs2D = aChannelConstructor.Get2dPresentation(); + + thePrs.myLeftBank = aChannelConstructor.GetLeftBank(); + thePrs.myRightBank = aChannelConstructor.GetRightBank(); + thePrs.myInlet = aChannelConstructor.GetInlet(); + thePrs.myOutlet = aChannelConstructor.GetOutlet(); + +#ifdef DEB_CHANNEL + BRepTools::Write( thePrs.myPrs2D, "channel2d.brep" ); + BRepTools::Write( thePrs.myPrs3D, "channel3d.brep" ); + HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Top shape edges:", thePrs.myPrs2D, TopAbs_EDGE ); + HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Left bank edges:", thePrs.myLeftBank, TopAbs_EDGE ); + HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Right bank edges:", thePrs.myRightBank, TopAbs_EDGE ); + HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Inlet edges:", thePrs.myInlet, TopAbs_EDGE ); + HYDROData_ShapesTool::DumpShapeSubShapes( std::cout, "Outlet edges:", thePrs.myOutlet, TopAbs_EDGE ); +#endif + + return true; +} + void HYDROData_Channel::Update() { HYDROData_ArtificialObject::Update(); Handle(HYDROData_Polyline3D) aGuideLine = GetGuideLine(); Handle(HYDROData_Profile) aProfile = GetProfile(); - if ( aGuideLine.IsNull() || aProfile.IsNull() ) - return; - // build 3d shape - TopoDS_Wire aPathWire = TopoDS::Wire(aGuideLine->GetShape3D()); - if(aPathWire.IsNull()) - return; - TopoDS_Wire aProfileWire = TopoDS::Wire( aProfile->GetShape3D() ); - if(aProfileWire.IsNull()) + PrsDefinition aResultPrs; + if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) ) return; - //BRepTools::Write( aPathWire, "guideline.brep" ); - //BRepTools::Write( aProfileWire, "profile.brep" ); + SetShape3D( aResultPrs.myPrs3D ); + SetTopShape( aResultPrs.myPrs2D ); - HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire ); - aChannelConstructor.Create3dPresentation(); - aChannelConstructor.Create2dPresentation(); - SetShape3D( aChannelConstructor.Get3dPresentation() ); - SetTopShape( aChannelConstructor.Get2dPresentation() ); + // Create groups for channel + TopTools_SequenceOfShape aLeftBankEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myLeftBank, TopAbs_EDGE, aLeftBankEdges ); + TopTools_SequenceOfShape aRightBankEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myRightBank, TopAbs_EDGE, aRightBankEdges ); + + TopTools_SequenceOfShape anInletEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myInlet, TopAbs_EDGE, anInletEdges ); + + TopTools_SequenceOfShape anOutletEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myOutlet, TopAbs_EDGE, anOutletEdges ); - /*TODO: groups via new API QString aLeftGroupName = GetName() + "_Left_Bank"; Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject(); aLeftGroup->SetName( aLeftGroupName ); - aLeftGroup->SetShapes( aProjLeftEdges ); + aLeftGroup->SetShapes( aLeftBankEdges ); QString aRightGroupName = GetName() + "_Right_Bank"; Handle(HYDROData_ShapesGroup) aRightGroup = createGroupObject(); aRightGroup->SetName( aRightGroupName ); - aRightGroup->SetShapes( aProjRightEdges ); + aRightGroup->SetShapes( aRightBankEdges ); QString anInGroupName = GetName() + "_Inlet"; Handle(HYDROData_ShapesGroup) anInGroup = createGroupObject(); anInGroup->SetName( anInGroupName ); - anInGroup->SetShapes( aProjInletEdges ); + anInGroup->SetShapes( anInletEdges ); QString anOutGroupName = GetName() + "_Outlet"; Handle(HYDROData_ShapesGroup) anOutGroup = createGroupObject(); anOutGroup->SetName( anOutGroupName ); - anOutGroup->SetShapes( aProjOutletEdges ); - */ + anOutGroup->SetShapes( anOutletEdges ); +} + +bool HYDROData_Channel::IsHas2dPrs() const +{ + return true; } QColor HYDROData_Channel::DefaultFillingColor() @@ -253,52 +314,3 @@ ObjectKind HYDROData_Channel::getAltitudeObjectType() const return KIND_OBSTACLE_ALTITUDE; } -void HYDROData_Channel::findEdges( const TopTools_SequenceOfShape& theInShapes, - const TopTools_ListOfShape& theEdges3D, - TopTools_SequenceOfShape& theOutShapes ) const -{ - theOutShapes.Clear(); - if ( theEdges3D.IsEmpty() || theInShapes.IsEmpty() ) - return; - - const TopoDS_Shape& aFirstShape3D = theEdges3D.First(); - const TopoDS_Shape& aLastShape3D = theEdges3D.Last(); - - TopoDS_Vertex aFirstVert, aLastVert, aDummyVert; - if ( !HYDROData_ShapesTool::Vertices( aFirstShape3D, aFirstVert, aDummyVert ) || - !HYDROData_ShapesTool::Vertices( aLastShape3D, aDummyVert, aLastVert ) ) - return; - - bool isStarted = false; - for ( int i = 1, n = theInShapes.Length(); i <= n; ++i ) - { - const TopoDS_Shape& anInShape = theInShapes.Value( i ); - - TopoDS_Vertex aShapeFirstVert, aShapeLastVert; - if ( !HYDROData_ShapesTool::Vertices( anInShape, aShapeFirstVert, aShapeLastVert ) ) - continue; - - if ( !isStarted ) - { - isStarted = HYDROData_ShapesTool::IsVerticesEquals( aFirstVert, aShapeFirstVert, true ); - } - - if ( isStarted ) - { - theOutShapes.Append( anInShape ); - - if ( HYDROData_ShapesTool::IsVerticesEquals( aLastVert, aShapeLastVert, true ) ) - break; - } - } -} - -void HYDROData_Channel::findEdges( const TopTools_SequenceOfShape& theProjShapes, - const TopoDS_Shape& theEdge3D, - TopTools_SequenceOfShape& theOutShapes ) const -{ - TopTools_ListOfShape aTmpList; - aTmpList.Append( theEdge3D ); - findEdges( theProjShapes, aTmpList, theOutShapes ); -} -