X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.cxx;h=526589c534ddbc005c9bf3c861e65cd29b350adf;hb=8d4dba4a45855249f5eb022e9cc7dcff202bce3c;hp=bf269244d08bd6abe8d4fce10332fff9432d07b7;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx index bf269244..526589c5 100644 --- a/src/HYDROData/HYDROData_Channel.cxx +++ b/src/HYDROData/HYDROData_Channel.cxx @@ -1,8 +1,4 @@ -// 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 -// +// 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 @@ -29,19 +25,42 @@ #include "HYDROData_Projection.h" #include "HYDROData_ShapesGroup.h" #include "HYDROData_ShapesTool.h" -#include "HYDROData_Pipes.h" +#include "HYDROData_Stream.h" +#include "HYDROData_Tool.h" + +#include #include #include #include +#include + +#include + +#include +#include + +#include + +#include + #include +#include + +#include +#include + +#include + +#include +#include #include #include #include -//#define DEB_CHANNEL 1 +#define DEB_CHANNEL 1 #ifdef DEB_CHANNEL #include #endif @@ -49,12 +68,14 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(HYDROData_Channel,HYDROData_ArtificialObject) +#define _DEVDEBUG_ +#include "HYDRO_trace.hxx" + IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject) HYDROData_Channel::HYDROData_Channel() -: HYDROData_ArtificialObject() +: HYDROData_ArtificialObject( Geom_3d ) { } @@ -62,19 +83,22 @@ HYDROData_Channel::~HYDROData_Channel() { } -QStringList HYDROData_Channel::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Channel::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { QStringList aResList = dumpObjectCreation( theTreatedObjects ); QString aName = GetObjPyName(); Handle(HYDROData_Polyline3D) aRefGideLine = GetGuideLine(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGideLine, "SetGuideLine" ); Handle(HYDROData_Profile) aRefProfile = GetProfile(); - setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefProfile, "SetProfile" ); + + aResList << QString( "%1.SetEquiDistance( %2 )" ).arg( aName ).arg( GetEquiDistance() ); aResList << QString( "" ); - aResList << QString( "%1.Update();" ).arg( aName ); + aResList << QString( "%1.Update()" ).arg( aName ); aResList << QString( "" ); return aResList; @@ -95,57 +119,185 @@ HYDROData_SequenceOfObjects HYDROData_Channel::GetAllReferenceObjects() const return aResSeq; } -TopoDS_Shape HYDROData_Channel::GetTopShape() const -{ - return getTopShape(); -} - -TopoDS_Shape HYDROData_Channel::GetShape3D() const -{ - return getShape3D(); -} - bool HYDROData_Channel::CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine, - const Handle(HYDROData_Profile)& theProfile, - PrsDefinition& thePrs ) + const Handle(HYDROData_Profile)& theProfile, + PrsDefinition& thePrs, + double theEquiDistance ) { - if ( theGuideLine.IsNull() || theProfile.IsNull() ) + // Check input parameters + 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() ) + if ( aPathWire.IsNull() || aProfileWire.IsNull() ) { return false; + } #ifdef DEB_CHANNEL - BRepTools::Write( aPathWire, "guideline.brep" ); - BRepTools::Write( aProfileWire, "profile.brep" ); + std::string brepName = "guideline_"; + brepName += theGuideLine->GetName().toStdString(); + brepName += ".brep"; + BRepTools::Write( aPathWire, brepName.c_str() ); + brepName = "profile_"; + brepName += theGuideLine->GetName().toStdString(); + brepName += ".brep"; + BRepTools::Write( aProfileWire, brepName.c_str() ); #endif - HYDROData_Canal3dAnd2d aChannelConstructor( aProfileWire, aPathWire ); - if( aChannelConstructor.GetStatus() != 0 ) + // Pre-processing + Handle(HYDROData_PolylineXY) aPolylineXY = theGuideLine->GetPolylineXY(); + if ( aPolylineXY.IsNull() ) { return false; + } - aChannelConstructor.Create3dPresentation(); - aChannelConstructor.Create2dPresentation(); - thePrs.myPrs3D = aChannelConstructor.Get3dPresentation(); - thePrs.myPrs2D = aChannelConstructor.Get2dPresentation(); + /* + HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 ); + HYDROData_IPolyline::PointsList aPolylinePoints = aPolylineXY->GetPoints( 0 ); + int aNbPoints = aPolylinePoints.Length(); + */ - thePrs.myLeftBank = aChannelConstructor.GetLeftBank(); - thePrs.myRightBank = aChannelConstructor.GetRightBank(); - thePrs.myInlet = aChannelConstructor.GetInlet(); - thePrs.myOutlet = aChannelConstructor.GetOutlet(); + HYDROData_Polyline3D::Polyline3DPoints aPolylinePoints3D = theGuideLine->GetPoints( theEquiDistance ); + int aNbPoints = aPolylinePoints3D.Length(); + if ( aNbPoints < 2 ) + return false; + + // Get tangent in each point of the guide line ( 2D ) + TColgp_Array1OfDir aTangents( 1, aNbPoints ); -#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 + HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 ); + + if( aSectionType == HYDROData_IPolyline::SECTION_POLYLINE ) + { + for ( int i = 1; i <= aNbPoints; ++i ) { + gp_XYZ aPnt = aPolylinePoints3D.Value( i ); + aPnt.SetZ( 0. ); + gp_XYZ aPrevPnt; + if ( i > 1 ) { + aPrevPnt = aPolylinePoints3D.Value( i - 1 ); + aPrevPnt.SetZ( 0. ); + } + + gp_Vec aDir; + if ( i < aNbPoints ) { + gp_XYZ aNextPnt = aPolylinePoints3D.Value( i + 1 ); + aNextPnt.SetZ( 0. ); + + gp_Vec anEdgeVec( aPnt, aNextPnt ); + + if ( i == 1 ) { + aDir = anEdgeVec; + } else { + gp_Vec aPrevVec( aPrevPnt, aPnt ); + aDir = aPrevVec.Normalized() + anEdgeVec.Normalized(); + } + } else { + aDir = gp_Vec( aPrevPnt, aPnt ); + } + + aTangents.SetValue( i, aDir ); + } + } else { + // Get curve from the first edge ( 2D ) + TopTools_SequenceOfShape anEdges; + HYDROData_ShapesTool::ExploreShapeToShapes( aPolylineXY->GetShape(), TopAbs_EDGE, anEdges ); + Standard_Real aStart, anEnd; + + Handle(Geom_Curve) aCurve = BRep_Tool::Curve( TopoDS::Edge( anEdges.First() ), aStart, anEnd ); + GeomAPI_ProjectPointOnCurve aProject; + + // Get tangents + for ( int i = 1; i <= aNbPoints; ++i ) { + gp_XYZ aPointToTest = aPolylinePoints3D.Value( i ); + aPointToTest.SetZ( 0. ); + + aProject.Init( aPointToTest, aCurve ); + Quantity_Parameter aParam = aProject.LowerDistanceParameter(); + gp_Pnt aPnt; + gp_Vec aDir; + aCurve->D1( aParam, aPnt, aDir); + + aTangents.SetValue( i, aDir ); + } + } + + // Get the profile middle point ( 3D ) + gp_Pnt aMiddlePoint( theProfile->GetMiddlePoint( true ) ); + + // Translate the profile to each point on the guide line ( 3D ) + Handle(TColgp_HArray1OfPnt) anArrayOfFPnt = new TColgp_HArray1OfPnt(1, aNbPoints ); + Handle(TColgp_HArray1OfPnt) anArrayOfLPnt = new TColgp_HArray1OfPnt(1, aNbPoints ); + Handle(TopTools_HArray1OfShape) anArrOfProfiles = new TopTools_HArray1OfShape( 1, aNbPoints ); + + for ( int i = 1; i <= aNbPoints; ++i ) { + // Get point on the guide line + gp_Pnt aPointOnGuide( aPolylinePoints3D.Value( i ) ); + + // Define translation and rotation: + gp_Trsf Translation, Rotation; + + // Translation + Translation.SetTranslation( aMiddlePoint, aPointOnGuide ); + TopoDS_Wire aTransformedProfile = + TopoDS::Wire( BRepBuilderAPI_Transform( aProfileWire, Translation, Standard_True ) ); + + // Rotation + gp_Vec aVertical( 0., 0., 1. ); + TopoDS_Vertex aLeftVertex, aRightVertex; + TopExp::Vertices( aTransformedProfile, aLeftVertex, aRightVertex ); + gp_Pnt aLeftPoint = BRep_Tool::Pnt( aLeftVertex ); + gp_Pnt aRightPoint = BRep_Tool::Pnt( aRightVertex ); + gp_Vec aLeftToRight( aLeftPoint, aRightPoint); + gp_Vec NormalToProfile = aVertical ^ aLeftToRight; + + gp_Vec aDir = aTangents.Value( i ); + gp_Vec AxisOfRotation = NormalToProfile ^ aDir; + if (AxisOfRotation.Magnitude() <= gp::Resolution()) { + if ( aVertical * aLeftToRight < 0. ) { + gp_Ax1 theVertical(aPointOnGuide, gp::DZ() ); + Rotation.SetRotation(theVertical, M_PI); + } + } else { + gp_Ax1 theAxis(aPointOnGuide, AxisOfRotation); + Standard_Real theAngle = NormalToProfile.AngleWithRef(aDir, AxisOfRotation); + Rotation.SetRotation(theAxis, theAngle); + } + + aTransformedProfile = TopoDS::Wire(BRepBuilderAPI_Transform( aTransformedProfile, Rotation, Standard_True) ); + + // Get the first and the last points of the transformed profile + TopoDS_Vertex V1, V2; + TopExp::Vertices( aTransformedProfile, V1, V2 ); + + // Fill the data + anArrayOfFPnt->SetValue( i, BRep_Tool::Pnt( V1 ) ); + anArrayOfLPnt->SetValue( i, BRep_Tool::Pnt( V2 ) ); + + anArrOfProfiles->SetValue( i, aTransformedProfile ); + } + + // Create presentation + HYDROData_Stream::PrsDefinition aPrs; + Handle(TopTools_HArray1OfShape) anArrOf2DProfiles; // we don't need 2D profiles for channel/digue presentation + + HYDROData_Stream::CreatePresentations( anArrayOfFPnt, anArrayOfLPnt, anArrOfProfiles, aPrs ); + thePrs.myInlet = aPrs.myInlet; + thePrs.myOutlet = aPrs.myOutlet; + thePrs.myLeftBank = aPrs.myLeftBank; + thePrs.myRightBank = aPrs.myRightBank; + thePrs.myPrs2D = TopoDS::Face(aPrs.myPrs2D); + thePrs.myPrs3D = aPrs.myPrs3D; + + //thePrs.myPrs2D = TopoDS::Face( aPrs.myPrs2D ); + //BRepBuilderAPI_MakeWire aMakeWire( aPrs.myLeftBank ) ; + //thePrs.myLeftBank = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myRightBank ); + //thePrs.myRightBank = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myInlet ); + //thePrs.myInlet = aMakeWire.Wire(); + //aMakeWire = BRepBuilderAPI_MakeWire( aPrs.myOutlet ); + //thePrs.myOutlet = aMakeWire.Wire(); return true; } @@ -158,7 +310,8 @@ void HYDROData_Channel::Update() Handle(HYDROData_Profile) aProfile = GetProfile(); PrsDefinition aResultPrs; - if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs ) ) + double anEquiDistance = GetEquiDistance(); + if ( !CreatePresentations( aGuideLine, aProfile, aResultPrs, anEquiDistance ) ) return; SetShape3D( aResultPrs.myPrs3D ); @@ -176,9 +329,9 @@ void HYDROData_Channel::Update() TopTools_SequenceOfShape anOutletEdges; HYDROData_ShapesTool::ExploreShapeToShapes( aResultPrs.myOutlet, TopAbs_EDGE, anOutletEdges ); - + + RemoveGroupObjects(); QString aLeftGroupName = GetName() + "_Left_Bank"; - Handle(HYDROData_ShapesGroup) aLeftGroup = createGroupObject(); aLeftGroup->SetName( aLeftGroupName ); aLeftGroup->SetShapes( aLeftBankEdges ); @@ -207,26 +360,16 @@ bool HYDROData_Channel::IsHas2dPrs() const return true; } -QColor HYDROData_Channel::DefaultFillingColor() +QColor HYDROData_Channel::DefaultFillingColor() const { return QColor( Qt::blue ); } -QColor HYDROData_Channel::DefaultBorderColor() +QColor HYDROData_Channel::DefaultBorderColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_Channel::getDefaultFillingColor() const -{ - return DefaultFillingColor(); -} - -QColor HYDROData_Channel::getDefaultBorderColor() const -{ - return DefaultBorderColor(); -} - bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGuideLine ) { Handle(HYDROData_Polyline3D) aPrevGuideLine = GetGuideLine(); @@ -247,7 +390,7 @@ bool HYDROData_Channel::SetGuideLine( const Handle(HYDROData_Polyline3D)& theGui SetReferenceObject( theGuideLine, DataTag_GuideLine ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } @@ -267,7 +410,7 @@ void HYDROData_Channel::RemoveGuideLine() ClearReferenceObjects( DataTag_GuideLine ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); } bool HYDROData_Channel::SetProfile( const Handle(HYDROData_Profile)& theProfile ) @@ -286,7 +429,7 @@ bool HYDROData_Channel::SetProfile( const Handle(HYDROData_Profile)& theProfile SetReferenceObject( theProfile, DataTag_Profile ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); return true; } @@ -306,11 +449,35 @@ void HYDROData_Channel::RemoveProfile() ClearReferenceObjects( DataTag_Profile ); // Indicate model of the need to update the chanel presentation - SetToUpdate( true ); + Changed( Geom_3d ); } ObjectKind HYDROData_Channel::getAltitudeObjectType() const { - return KIND_OBSTACLE_ALTITUDE; + //DEBTRACE("HYDROData_Channel::getAltitudeObjectType"); + return KIND_CHANNEL_ALTITUDE; + //return KIND_STREAM_ALTITUDE; +} + +TopoDS_Shape HYDROData_Channel::GetLeftShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 1); +} + +TopoDS_Shape HYDROData_Channel::GetRightShape() const +{ + HYDROData_SequenceOfObjects aGroups = GetGroups(); + return HYDROData_Tool::getFirstShapeFromGroup( aGroups, 2); +} + +void HYDROData_Channel::SetEquiDistance( double theEquiDistance ) +{ + double anEquiDistance = theEquiDistance > 0 ? theEquiDistance : 1E-3; + SetDouble( DataTag_EquiDistance, theEquiDistance ); } +double HYDROData_Channel::GetEquiDistance() const +{ + return GetDouble( DataTag_EquiDistance, 1.0 ); +}