X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_ProfileUZ.cxx;h=bfe75e3b55092840f3f6701cdf2f9e74bb27cc5b;hb=a95289fabbb6fbf6f32c06207422c65aafd5bd65;hp=80fe9987309b306ecf9dc7ac997a2718e8577ec7;hpb=b0759ef35e28020af9766fc25ae9b8796f851b80;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_ProfileUZ.cxx b/src/HYDROData/HYDROData_ProfileUZ.cxx old mode 100755 new mode 100644 index 80fe9987..bfe75e3b --- a/src/HYDROData/HYDROData_ProfileUZ.cxx +++ b/src/HYDROData/HYDROData_ProfileUZ.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_ProfileUZ.h" @@ -8,10 +25,16 @@ #include +#include +#include +#include #include #include +#include +#include + IMPLEMENT_STANDARD_HANDLE(HYDROData_ProfileUZ, HYDROData_IPolyline) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_ProfileUZ, HYDROData_IPolyline) @@ -25,26 +48,25 @@ HYDROData_ProfileUZ::~HYDROData_ProfileUZ() { } -TopoDS_Shape HYDROData_ProfileUZ::GetShape() +TopoDS_Shape HYDROData_ProfileUZ::GetShape() const { - // TODO return TopoDS_Shape(); } -double HYDROData_ProfileUZ::GetDepthFromDistance( const double& theDistance ) const +double HYDROData_ProfileUZ::GetDepthFromDistance( const PointsList& thePoints, + const double& theDistance ) { double aResDepth = 0.0; - HYDROData_IPolyline::PointsList aPoints = GetPoints(); - int aNbPoints = aPoints.Size(); + int aNbPoints = thePoints.Size(); if ( aNbPoints < 2 ) return aResDepth; double aCompDist = 0.0; - HYDROData_IPolyline::Point aPrevPoint = aPoints.First(); + HYDROData_IPolyline::Point aPrevPoint = thePoints.First(); for ( int i = 2; i <= aNbPoints; ++i ) { - const Point& aCurPoint = aPoints.Value( i ); + const Point& aCurPoint = thePoints.Value( i ); double aPntDist = gp_Pnt2d( aPrevPoint.X(), 0 ).Distance( gp_Pnt2d( aCurPoint.X(), 0 ) ); @@ -52,7 +74,7 @@ double HYDROData_ProfileUZ::GetDepthFromDistance( const double& theDistance ) co if ( theDistance < aCompDist ) { - double aComPntDist = gp_Pnt2d( aPoints.First().X(), 0 ).Distance( gp_Pnt2d( aPrevPoint.X(), 0 ) ); + double aComPntDist = gp_Pnt2d( thePoints.First().X(), 0 ).Distance( gp_Pnt2d( aPrevPoint.X(), 0 ) ); double aFindDist = theDistance - aComPntDist; double aRatio = aFindDist / ( aPntDist - aFindDist ); @@ -60,6 +82,7 @@ double HYDROData_ProfileUZ::GetDepthFromDistance( const double& theDistance ) co aResDepth = ( aPrevPoint.Y() + aRatio * aCurPoint.Y() ) / ( 1 + aRatio ); break; } + else aResDepth = aCurPoint.Y(); // TODO: workaround for normalized flat altitudes aPrevPoint = aCurPoint; } @@ -90,12 +113,29 @@ void HYDROData_ProfileUZ::SetSectionName( const int /*theSe HYDROData_ProfileUZ::SectionType HYDROData_ProfileUZ::GetSectionType( const int /*theSectionIndex*/ ) const { - return SECTION_POLYLINE; + Handle(TDataStd_ExtStringList) aNamesList; + Handle(TDataStd_IntegerList) aTypesList; + Handle(TDataStd_BooleanList) aClosuresList; + getSectionsLists( aNamesList, aTypesList, aClosuresList, false ); + if ( aTypesList.IsNull() || aTypesList->IsEmpty() ) + return SECTION_POLYLINE; + + return (SectionType)aTypesList->First(); } void HYDROData_ProfileUZ::SetSectionType( const int /*theSectionIndex*/, - const SectionType /*theSectionType*/ ) + const SectionType theSectionType ) { + Handle(TDataStd_ExtStringList) aNamesList; + Handle(TDataStd_IntegerList) aTypesList; + Handle(TDataStd_BooleanList) aClosuresList; + getSectionsLists( aNamesList, aTypesList, aClosuresList ); + if ( aTypesList.IsNull() ) + return; + + // Refill the existing list + aTypesList->Clear(); + aTypesList->Append( theSectionType ); } bool HYDROData_ProfileUZ::IsClosedSection( const int /*theSectionIndex*/ ) const @@ -219,7 +259,7 @@ void HYDROData_ProfileUZ::RemovePoint( const int /*theSectionIndex*/, } } -HYDROData_ProfileUZ::PointsList HYDROData_ProfileUZ::GetPoints( const int /*theSectionIndex*/ ) const +HYDROData_ProfileUZ::PointsList HYDROData_ProfileUZ::GetPoints( const int /*theSectionIndex*/, bool /*IsConvertToGlobal*/ ) const { PointsList aResList; @@ -239,4 +279,36 @@ HYDROData_ProfileUZ::PointsList HYDROData_ProfileUZ::GetPoints( const int /*theS return aResList; } +void HYDROData_ProfileUZ::CalculateAndAddPoints(const NCollection_Sequence& theXYZPoints, Handle_HYDROData_PolylineXY& thePolylineXY) +{ + // Fill 2D polyline + for ( int i = 1; i <= theXYZPoints.Size(); i++ ) { + const HYDROData_Profile::ProfilePoint& aBottomPoint = theXYZPoints.Value( i ); + thePolylineXY->AddPoint( 0, HYDROData_PolylineXY::Point( aBottomPoint.X(), aBottomPoint.Y() ) ); + } + + // Calculate profile UZ points + + // First point + const HYDROData_Profile::ProfilePoint& aFirstBottomPoint = theXYZPoints.First(); + AddPoint( 0, HYDROData_ProfileUZ::Point( 0, aFirstBottomPoint.Z() ) ); + + // Intermediate points + double aPolylineCommonDist = thePolylineXY->GetDistance( 0, thePolylineXY->NbPoints( 0 ) - 1 ); + + for ( int i = 2, aNbPoints = theXYZPoints.Size(); i < aNbPoints; i++ ) { + const HYDROData_Profile::ProfilePoint& aBottomPoint = theXYZPoints.Value( i ); + + double aDistance = thePolylineXY->GetDistance( 0, i - 1 ); + + Standard_Real anU = aDistance; // = ( aDistance / aPolylineCommonDist ) * aPolylineCommonDist; + AddPoint( 0, HYDROData_ProfileUZ::Point( anU, aBottomPoint.Z() ) ); + } + + // Last point + const HYDROData_Profile::ProfilePoint& aLastBottomPoint = theXYZPoints.Last(); + AddPoint( 0, HYDROData_ProfileUZ::Point( aPolylineCommonDist, aLastBottomPoint.Z() ) ); + +} +