From fcece92742680e708f87352c32597ec2d84bfe2f Mon Sep 17 00:00:00 2001 From: adv Date: Mon, 16 Dec 2013 07:46:40 +0000 Subject: [PATCH] Methods renamed. --- src/HYDROData/HYDROData_Profile.cxx | 18 +++++++++--------- src/HYDROData/HYDROData_Profile.h | 8 ++++---- src/HYDROData/HYDROData_Stream.cxx | 2 +- src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx index f2f8ba46..6ed959ce 100755 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -61,7 +61,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const TopoDS_Wire aWire; gp_XY aFirstPoint, aLastPoint; - if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) ) + if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) ) return aWire; gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0 ); @@ -132,14 +132,14 @@ QColor HYDROData_Profile::getDefaultBorderColor() const bool HYDROData_Profile::IsValid() const { gp_XY aFirstPoint, aLastPoint; - if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) ) + if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) ) return false; int aNbPoints = NbPoints(); return aNbPoints > 1; } -void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint ) +void HYDROData_Profile::SetLeftPoint( const gp_XY& thePoint ) { TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint ); @@ -153,7 +153,7 @@ void HYDROData_Profile::SetFirstPoint( const gp_XY& thePoint ) SetToUpdate( true ); } -bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const +bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const { TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false ); if ( aLabel.IsNull() ) @@ -169,7 +169,7 @@ bool HYDROData_Profile::GetFirstPoint( gp_XY& thePoint ) const return true; } -void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint ) +void HYDROData_Profile::SetRightPoint( const gp_XY& thePoint ) { TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint ); @@ -183,7 +183,7 @@ void HYDROData_Profile::SetLastPoint( const gp_XY& thePoint ) SetToUpdate( true ); } -bool HYDROData_Profile::GetLastPoint( gp_XY& thePoint ) const +bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const { TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false ); if ( aLabel.IsNull() ) @@ -291,8 +291,8 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints ) aProfileUZ->AddPoint( 0, aParPoint ); } - SetFirstPoint( aFirstPoint ); - SetLastPoint( aLastPoint ); + SetLeftPoint( aFirstPoint ); + SetRightPoint( aLastPoint ); } HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const @@ -300,7 +300,7 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const ProfilePoints aResPoints; gp_XY aFirstPoint, aLastPoint; - if ( !GetFirstPoint( aFirstPoint ) || !GetLastPoint( aLastPoint ) ) + if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) ) return aResPoints; HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints(); diff --git a/src/HYDROData/HYDROData_Profile.h b/src/HYDROData/HYDROData_Profile.h index dc62e6fe..48c944b6 100644 --- a/src/HYDROData/HYDROData_Profile.h +++ b/src/HYDROData/HYDROData_Profile.h @@ -99,27 +99,27 @@ public: * Set first(left) point for profile. * \param thePoint the point */ - HYDRODATA_EXPORT void SetFirstPoint( const gp_XY& thePoint ); + HYDRODATA_EXPORT void SetLeftPoint( const gp_XY& thePoint ); /** * Returns first(left) point of profile. * \param thePoint[out] profile first point * \return true if point has been set */ - HYDRODATA_EXPORT bool GetFirstPoint( gp_XY& thePoint ) const; + HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint ) const; /** * Set last(right) point for profile. * \param thePoint the point */ - HYDRODATA_EXPORT void SetLastPoint( const gp_XY& thePoint ); + HYDRODATA_EXPORT void SetRightPoint( const gp_XY& thePoint ); /** * Returns last(right) point of profile. * \param thePoint[out] profile last point * \return true if point has been set */ - HYDRODATA_EXPORT bool GetLastPoint( gp_XY& thePoint ) const; + HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint ) const; /** diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx index b0a2bbdd..63e983ec 100644 --- a/src/HYDROData/HYDROData_Stream.cxx +++ b/src/HYDROData/HYDROData_Stream.cxx @@ -165,7 +165,7 @@ void HYDROData_Stream::Update() continue; const TopoDS_Shape& aProf3d = aProfile->GetShape3D(); gp_XY aPnt1, aPnt2; - if ( !aProfile->GetFirstPoint( aPnt1 ) || !aProfile->GetLastPoint( aPnt2 ) ) + if ( !aProfile->GetLeftPoint( aPnt1 ) || !aProfile->GetRightPoint( aPnt2 ) ) continue; anArrOfProfiles.SetValue(i,aProfile->GetShape3D());//aProfile->GetTopShape(); anArrOf2DProfiles.SetValue(i,aProfile->GetTopShape()); diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx index 32355f8a..a3b5295e 100644 --- a/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx +++ b/src/HYDROGUI/HYDROGUI_GeoreferencementOp.cxx @@ -233,8 +233,8 @@ bool HYDROGUI_GeoreferencementOp::store( QString& theErrorMsg ) HYDROGUI_Tool::FindObjectByName( module(), aGeoData.Name, KIND_PROFILE ) ); if ( !aProfile.IsNull() ) { if ( !aGeoData.isEmpty ) { - aProfile->SetFirstPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) ); - aProfile->SetLastPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) ); + aProfile->SetLeftPoint( gp_XY( aGeoData.Xg, aGeoData.Yg ) ); + aProfile->SetRightPoint( gp_XY( aGeoData.Xd, aGeoData.Yd ) ); } else { aProfile->Invalidate(); } @@ -283,7 +283,7 @@ void HYDROGUI_GeoreferencementOp::setPanelData( HYDROGUI_GeoreferencementDlg::ProfileGeoData aGeoData( aProfile->GetName() ); gp_XY aFirstPoint, aLastPoint; - if ( aProfile->GetFirstPoint( aFirstPoint ) && aProfile->GetLastPoint( aLastPoint ) ) { + if ( aProfile->GetLeftPoint( aFirstPoint ) && aProfile->GetRightPoint( aLastPoint ) ) { aGeoData = HYDROGUI_GeoreferencementDlg::ProfileGeoData( aGeoData.Name, aFirstPoint.X(), aFirstPoint.Y(), -- 2.39.2