X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Profile.cxx;h=99412519316018719820d4057e015a934117ba32;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=9c4eda1d8288de01ba5a2b436f6acaa4b6e9bca2;hpb=d6a8c59ee076938a924fcfd1e3f83ef1395b7336;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx old mode 100755 new mode 100644 index 9c4eda1d..99412519 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -23,8 +23,6 @@ #include "HYDROData_Tool.h" #include "HYDROData_PolylineXY.h" -#include - #include #include #include @@ -37,6 +35,9 @@ #include #include #include +#include +#include +#include #include #include @@ -52,7 +53,6 @@ #include #include -IMPLEMENT_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object) IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object) HYDROData_Profile::HYDROData_Profile() @@ -64,7 +64,8 @@ HYDROData_Profile::~HYDROData_Profile() { } -QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const +QStringList HYDROData_Profile::DumpToPython( const QString& thePyScriptPath, + MapOfTreatedObjects& theTreatedObjects ) const { QStringList aResList = dumpObjectCreation( theTreatedObjects ); QString aProfileName = GetObjPyName(); @@ -72,7 +73,7 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje //TCollection_AsciiString aFilePath = GetFilePath(); //if ( !aFilePath.IsEmpty() ) //{ - // aResList << QString( "%1.ImportFromFile( \"%2\" );" ) + // aResList << QString( "%1.ImportFromFile( \"%2\" )" ) // .arg( aName ).arg( aFilePath.ToCString() ); //} @@ -115,7 +116,7 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje aResList << aPntsDefinition; - aResList << QString( "%1.%3( %2 );" ) + aResList << QString( "%1.%3( %2 )" ) .arg( aProfileName ).arg( aPntsListName ) .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" ); @@ -129,13 +130,13 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje HYDROData_IPolyline::SectionType aSecType = aPrf->GetSectionType( 0 ); if ( aSecType != HYDROData_IPolyline::SECTION_POLYLINE ) { - aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 );" ) + aResList << QString( "%1.GetProfileUZ().SetSectionType( 0, %2 )" ) .arg( aProfileName ).arg( "HYDROData_IPolyline.SECTION_SPLINE" ); aResList << QString( "" ); } } - aResList << QString( "%1.Update();" ).arg( aProfileName ); + aResList << QString( "%1.Update()" ).arg( aProfileName ); aResList << QString( "" ); return aResList; @@ -163,7 +164,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const TopoDS_Shape HYDROData_Profile::GetShape3D() const { - TopoDS_Shape aShape = getShape3D(); + TopoDS_Shape aShape = HYDROData_Object::GetShape3D(); if( aShape.IsNull() ) aShape = CreateProfileWire( true ); return aShape; @@ -191,26 +192,16 @@ void HYDROData_Profile::Update() SetShape3D( aShape ); } -QColor HYDROData_Profile::DefaultFillingColor() +QColor HYDROData_Profile::DefaultFillingColor() const { return QColor( Qt::transparent ); } -QColor HYDROData_Profile::DefaultBorderColor() +QColor HYDROData_Profile::DefaultBorderColor() const { return QColor( Qt::black ); } -QColor HYDROData_Profile::getDefaultFillingColor() const -{ - return DefaultFillingColor(); -} - -QColor HYDROData_Profile::getDefaultBorderColor() const -{ - return DefaultBorderColor(); -} - bool HYDROData_Profile::IsValid() const { gp_XY aFirstPoint, aLastPoint; @@ -488,7 +479,8 @@ TCollection_AsciiString HYDROData_Profile::GetFilePath() const int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc, const TCollection_AsciiString& theFileName, - NCollection_Sequence& theBadProfilesIds ) + NCollection_Sequence& theBadProfilesIds, + bool isToProject ) { if ( theDoc.IsNull() || theFileName.IsEmpty() ) return 0; @@ -511,7 +503,7 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc, aNewProfile = Handle(HYDROData_Profile)::DownCast( theDoc->CreateObject( KIND_PROFILE ) ); bool anIsRead = false; - if ( aNewProfile->ImportFromFile( aFile, &anIsRead ) ) + if ( aNewProfile->ImportFromFile( aFile, isToProject, &anIsRead ) ) { aCreatedProfiles.Append( aNewProfile ); aNewProfile.Nullify(); @@ -537,17 +529,18 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc, aProfile->SetFilePath( theFileName ); - aProfile->SetBorderColor( HYDROData_Profile::DefaultBorderColor() ); + aProfile->SetBorderColor( aProfile->DefaultBorderColor() ); } return aCreatedProfiles.Length(); } bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileName, - bool* theIsRead ) + bool isToProject, + bool* isNotEmpty ) { - if ( theIsRead ) - *theIsRead = false; + if( isNotEmpty ) + *isNotEmpty = false; // Try to open the file OSD_File aFile( theFileName ); @@ -558,7 +551,7 @@ bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileNa if ( !aFile.IsOpen() ) return false; - bool aRes = ImportFromFile( aFile, theIsRead ); + bool aRes = ImportFromFile( aFile, isToProject, isNotEmpty ); // Close the file aFile.Close(); @@ -573,10 +566,11 @@ bool HYDROData_Profile::ImportFromFile( const TCollection_AsciiString& theFileNa } bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, - bool* theIsRead ) + bool isToProject, + bool* isNotEmpty ) { - if ( theIsRead ) - *theIsRead = false; + if( isNotEmpty ) + *isNotEmpty = false; if ( !theFile.IsOpen() ) return false; @@ -606,8 +600,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, } // Set flag of read status to true - if ( theIsRead ) - *theIsRead = true; + if( isNotEmpty ) + *isNotEmpty = true; TCollection_AsciiString aValX = aLine.Token( " \t", 1 ); TCollection_AsciiString aValY = aLine.Token( " \t", 2 ); @@ -629,8 +623,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, double aCoordX = aValX.RealValue(); double aCoordY = aValY.RealValue(); - if ( boost::math::isnan( aCoordX ) || boost::math::isinf( aCoordX ) || - boost::math::isnan( aCoordY ) || boost::math::isinf( aCoordY ) ) + if ( HYDROData_Tool::IsNan( aCoordX ) || HYDROData_Tool::IsInf( aCoordX ) || + HYDROData_Tool::IsNan( aCoordY ) || HYDROData_Tool::IsInf( aCoordY ) ) aRes = false; if ( anIsParametric ) @@ -656,7 +650,7 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, } double aCoordZ = aValZ.RealValue(); - if ( boost::math::isnan( aCoordZ ) || boost::math::isinf( aCoordZ ) ) + if ( HYDROData_Tool::IsNan( aCoordZ ) || HYDROData_Tool::IsInf( aCoordZ ) ) aRes = false; ProfilePoint aPoint( aCoordX, aCoordY, aCoordZ ); @@ -675,6 +669,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, } else if ( anIsGeoref ) { + if( isToProject ) + ProjectProfilePoints( aPointsXYZ ); SetProfilePoints( aPointsXYZ, true ); } @@ -789,4 +785,21 @@ HYDROData_Profile::ProfilePoint HYDROData_Profile::GetBottomPoint() const } return aMiddlePoint; - } \ No newline at end of file + } + +void HYDROData_Profile::ProjectProfilePoints( ProfilePoints& thePoints ) +{ + int low = thePoints.Lower(), up = thePoints.Upper(); + gp_Pnt aFirst = thePoints.Value( low ); + gp_Pnt aLast = thePoints.Value( up ); + gp_Vec d( aFirst, aLast ); + gp_Vec n( d.Y(), -d.X(), 0 ); + + Handle(Geom_Plane) aPlane = new Geom_Plane( aFirst, gp_Dir( n ) ); + for( int i=low; i<=up; i++ ) + { + gp_XYZ p = thePoints.Value( i ); + gp_Pnt pp = GeomAPI_ProjectPointOnSurf( p, aPlane ); + thePoints.SetValue( i, pp.XYZ() ); + } +}