X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Profile.cxx;h=15e91a519143d02f8b19c4eb6e660a3a68b5d875;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=bf834894e2434d281261f4a3803e03d7852768e9;hpb=0782f4e14e6d203e9983ca7508fca825388871bf;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx index bf834894..15e91a51 100644 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -74,14 +74,14 @@ QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPat QString aProfileName = GetObjPyName(); //TCollection_AsciiString aFilePath = GetFilePath(); - //if ( !aFilePath.IsEmpty() ) + //if ( !aFilePath.IsEmpty() ) //{ // aResList << QString( "%1.ImportFromFile( \"%2\" )" ) // .arg( aName ).arg( aFilePath.ToCString() ); //} bool anIsValidProfile = IsValid(); - + QStringList aPntsDefinition; QString aPntsListName = HYDROData_Tool::GenerateNameForPython( theTreatedObjects, "profile_points" ); @@ -114,15 +114,15 @@ QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPat QString& aFirstStr = aPntsDefinition.first(); aFirstStr = aFirstStr.trimmed(); aFirstStr.prepend( QString( "%1 = [ " ).arg( aPntsListName ) ); - + aPntsDefinition.last().append( " ];" ); aResList << aPntsDefinition; - + aResList << QString( "%1.%3( %2 )" ) .arg( aProfileName ).arg( aPntsListName ) .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" ); - + aResList << QString( "" ); } @@ -426,7 +426,7 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool I aLastPoint = aPointXY; double aDistance = gp_Pnt2d( aFirstPoint ).Distance( aPointXY ); - + HYDROData_ProfileUZ::Point aParPoint( aDistance, aPoint.Z() ); aProfileUZ->AddPoint( 0, aParPoint ); } @@ -449,7 +449,7 @@ HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints } HYDROData_Profile::ProfilePoints HYDROData_Profile::CalculateProfilePoints( - const HYDROData_ProfileUZ::PointsList& theParametricPoints, + const HYDROData_ProfileUZ::PointsList& theParametricPoints, const gp_XY& aFirstPoint, const gp_XY& aLastPoint) { ProfilePoints aResPoints; @@ -538,7 +538,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc, { if ( aNewProfile.IsNull() ) aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) ); - + bool anIsRead = false; if ( aNewProfile->ImportFromFile( aFile, isToProject, &anIsRead ) ) { @@ -694,8 +694,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, aPointsXYZ.Append( aPoint ); } } - - aRes = aRes && ( anIsParametric && !aPointsUZ.IsEmpty() || + + aRes = aRes && ( anIsParametric && !aPointsUZ.IsEmpty() || anIsGeoref && !aPointsXYZ.IsEmpty() ); if ( aRes ) { @@ -789,12 +789,12 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint(bool IsConvert HYDROData_Profile::ProfilePoint HYDROData_Profile::GetMiddlePoint( bool CanUseDefault ) const { ProfilePoint aMiddlePoint; - + gp_XY aLeftPnt, aRightPnt; if ( GetLeftPoint( aLeftPnt, true, CanUseDefault ) && GetRightPoint( aRightPnt, true, CanUseDefault ) ) { gp_XYZ aPnt1( aLeftPnt.X(), aLeftPnt.Y(), 0. ); gp_XYZ aPnt2( aRightPnt.X(), aRightPnt.Y(), 0. ); - gp_Pnt aMiddlePoint2d( 0.5 * ( aPnt1 + aPnt2 ) ); + gp_Pnt aMiddlePoint2d( 0.5 * ( aPnt1 + aPnt2 ) ); gp_Lin aMidLin( aMiddlePoint2d, gp::DZ() ); TopoDS_Edge aMidEdge = BRepLib_MakeEdge( aMidLin );