Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

[modules/hydro.git] / src / HYDROData / HYDROData_Profile.cxx

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 4f69515e8a919ffac14a29a26bf5acca85ba8fbd..99412519316018719820d4057e015a934117ba32 100644 (file)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -35,6 +35,9 @@
 #include <gp_XY.hxx>
 #include <gp_XYZ.hxx>
 #include <gp_Pnt2d.hxx>
+#include <gp_Ax3.hxx>
+#include <GeomAPI_ProjectPointOnSurf.hxx>
+#include <Geom_Plane.hxx>
 
 #include <TDataStd_AsciiString.hxx>
 #include <TDataStd_RealArray.hxx>
@@ -50,7 +53,6 @@
 #include <QColor>
 #include <QStringList>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Profile, HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Profile, HYDROData_Object)
 
 HYDROData_Profile::HYDROData_Profile()
@@ -71,7 +73,7 @@ QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPat
   //TCollection_AsciiString aFilePath = GetFilePath();
   //if ( !aFilePath.IsEmpty() ) 
   //{
-  //  aResList << QString( "%1.ImportFromFile( \"%2\" );" )
+  //  aResList << QString( "%1.ImportFromFile( \"%2\" )" )
   //            .arg( aName ).arg( aFilePath.ToCString() );
   //}
 
@@ -114,7 +116,7 @@ QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPat
 
     aResList << aPntsDefinition;
     
-    aResList << QString( "%1.%3( %2 );" )
+    aResList << QString( "%1.%3( %2 )" )
                 .arg( aProfileName ).arg( aPntsListName )
                 .arg( anIsValidProfile ? "SetProfilePoints" : "SetParametricPoints" );
   
@@ -128,13 +130,13 @@ QStringList HYDROData_Profile::DumpToPython( const QString&       thePyScriptPat
     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;
@@ -477,7 +479,8 @@ TCollection_AsciiString HYDROData_Profile::GetFilePath() const
 
 int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
                                        const TCollection_AsciiString&    theFileName,
-                                       NCollection_Sequence<int>&        theBadProfilesIds )
+                                       NCollection_Sequence<int>&        theBadProfilesIds,
+                                       bool isToProject )
 {
   if ( theDoc.IsNull() || theFileName.IsEmpty() )
     return 0;
@@ -500,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();
@@ -533,10 +536,11 @@ int HYDROData_Profile::ImportFromFile( const Handle(HYDROData_Document)& theDoc,
 }
 
 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 );
@@ -547,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();
@@ -562,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;
@@ -595,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 );
@@ -664,6 +669,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
     }
     else if ( anIsGeoref )
     {
+      if( isToProject )
+        ProjectProfilePoints( aPointsXYZ );
       SetProfilePoints( aPointsXYZ, true );
     }
 
@@ -778,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() );
+  }
+}