Bug #490: batch mode error.

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

diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx
index 76dfad84e4cbe97516c276d931b1c9133e19db9c..494461f2d15ec65cf4ea33924507ca4dc3dab89c 100755 (executable)
--- a/src/HYDROData/HYDROData_Profile.cxx
+++ b/src/HYDROData/HYDROData_Profile.cxx
@@ -60,7 +60,7 @@ QStringList HYDROData_Profile::DumpToPython( MapOfTreatedObjects& theTreatedObje
   QString aGap = QString().fill( ' ', aPntsListName.length() + 5 );
   if ( anIsValidProfile )
   {
-    HYDROData_Profile::ProfilePoints aPointsList = GetProfilePoints();
+    HYDROData_Profile::ProfilePoints aPointsList = GetProfilePoints( true );
     for ( int k = 1, aNbPoints = aPointsList.Size(); k <= aNbPoints; ++k )
     {
       const ProfilePoint& aPoint = aPointsList.Value( k );
@@ -122,7 +122,7 @@ TopoDS_Shape HYDROData_Profile::GetTopShape() const
   TopoDS_Wire aWire;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint, false ) || !GetRightPoint( aLastPoint, false ) )
     return aWire;
 
   gp_Pnt aPnt1( aFirstPoint.X(), aFirstPoint.Y(), 0 );
@@ -150,7 +150,7 @@ void HYDROData_Profile::Update()
   Handle(HYDROData_ProfileUZ) aProfile = GetProfileUZ( false );
   if ( !aProfile.IsNull() )
   {
-    ProfilePoints aProfilePoints = GetProfilePoints();
+    ProfilePoints aProfilePoints = GetProfilePoints( false );
     HYDROData_IPolyline::SectionType aSectionType = aProfile->GetSectionType( 0 );
 
     aWire = HYDROData_PolylineXY::BuildWire( aSectionType, false, aProfilePoints );
@@ -181,33 +181,41 @@ QColor HYDROData_Profile::getDefaultBorderColor() const
 bool HYDROData_Profile::IsValid() const
 {
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint, false ) || !GetRightPoint( aLastPoint, false ) )
     return false;
 
   int aNbPoints = NbPoints();
   return aNbPoints > 1;
 }
 
-void HYDROData_Profile::SetLeftPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetLeftPoint( const gp_XY& theGPoint, bool IsConvertFromGlobal )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint );
+  if ( aLabel.IsNull() )
+    return;
+
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  gp_XY aLPoint = theGPoint;
+  if( IsConvertFromGlobal )
+    aDoc->Transform( aLPoint, true );
 
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
     anArray = TDataStd_RealArray::Set( aLabel, 0, 1 );
 
-  anArray->SetValue( 0, thePoint.X() );
-  anArray->SetValue( 1, thePoint.Y() );
+  anArray->SetValue( 0, aLPoint.X() );
+  anArray->SetValue( 1, aLPoint.Y() );
 
   SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_FirstPoint, false );
   if ( aLabel.IsNull() )
     return false;
 
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
     return false;
@@ -215,29 +223,38 @@ bool HYDROData_Profile::GetLeftPoint( gp_XY& thePoint ) const
   thePoint.SetX( anArray->Value( 0 ) );
   thePoint.SetY( anArray->Value( 1 ) );
 
+  if( IsConvertToGlobal )
+    aDoc->Transform( thePoint, false );
+
   return true;
 }
 
-void HYDROData_Profile::SetRightPoint( const gp_XY& thePoint )
+void HYDROData_Profile::SetRightPoint( const gp_XY& theGPoint, bool IsConvertFromGlobal )
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint );
 
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
+  gp_XY aLPoint = theGPoint;
+  if( IsConvertFromGlobal )
+    aDoc->Transform( aLPoint, true );
+
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
     anArray = TDataStd_RealArray::Set( aLabel, 0, 1 );
 
-  anArray->SetValue( 0, thePoint.X() );
-  anArray->SetValue( 1, thePoint.Y() );
+  anArray->SetValue( 0, aLPoint.X() );
+  anArray->SetValue( 1, aLPoint.Y() );
 
   SetToUpdate( true );
 }
 
-bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const
+bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal ) const
 {
   TDF_Label aLabel = myLab.FindChild( DataTag_LastPoint, false );
   if ( aLabel.IsNull() )
     return false;
 
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( myLab );
   Handle(TDataStd_RealArray) anArray;
   if ( !aLabel.FindAttribute( TDataStd_RealArray::GetID(), anArray ) )
     return false;
@@ -245,6 +262,9 @@ bool HYDROData_Profile::GetRightPoint( gp_XY& thePoint ) const
   thePoint.SetX( anArray->Value( 0 ) );
   thePoint.SetY( anArray->Value( 1 ) );
 
+  if( IsConvertToGlobal )
+    aDoc->Transform( thePoint, false );
+
   return true;
 }
 
@@ -315,7 +335,7 @@ HYDROData_ProfileUZ::PointsList HYDROData_Profile::GetParametricPoints() const
   return aProfileUZ.IsNull() ? HYDROData_ProfileUZ::PointsList() : aProfileUZ->GetPoints();
 }
 
-void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
+void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints, bool IsConvertFromGlobal )
 {
   RemovePoints();
   if ( thePoints.Length() < 2 )
@@ -323,10 +343,14 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
 
   gp_XY aFirstPoint, aLastPoint;
 
+  Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( Label() );
   Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
   for ( int i = 1, n = thePoints.Length(); i <= n ; ++i )
   {
-    const ProfilePoint& aPoint = thePoints.Value( i );
+    ProfilePoint aPoint = thePoints.Value( i );
+    if( IsConvertFromGlobal )
+      aDoc->Transform( aPoint, true );
+
     gp_XY aPointXY( aPoint.X(), aPoint.Y() );
 
     if ( i == 1 )
@@ -340,16 +364,17 @@ void HYDROData_Profile::SetProfilePoints( const ProfilePoints& thePoints )
     aProfileUZ->AddPoint( 0, aParPoint );
   }
 
-  SetLeftPoint( aFirstPoint );
-  SetRightPoint( aLastPoint );
+  SetLeftPoint( aFirstPoint, false );//already converted to local CS
+  SetRightPoint( aLastPoint, false );
 }
 
-HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints() const
+HYDROData_Profile::ProfilePoints HYDROData_Profile::GetProfilePoints( bool IsConvertToGlobal ) const
 {
   ProfilePoints aResPoints;
 
   gp_XY aFirstPoint, aLastPoint;
-  if ( !GetLeftPoint( aFirstPoint ) || !GetRightPoint( aLastPoint ) )
+  if ( !GetLeftPoint( aFirstPoint, IsConvertToGlobal ) ||
+       !GetRightPoint( aLastPoint, IsConvertToGlobal ) )
     return aResPoints;
 
   HYDROData_ProfileUZ::PointsList aParametricPoints = GetParametricPoints();
@@ -594,7 +619,7 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
     }
     else if ( anIsGeoref )
     {
-      SetProfilePoints( aPointsXYZ );
+      SetProfilePoints( aPointsXYZ, true );
     }
 
     Update();
@@ -603,5 +628,18 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile,
   return aRes;
 }
 
+void HYDROData_Profile::UpdateLocalCS( double theDx, double theDy )
+{
+  gp_XY aDelta( theDx, theDy );
+  gp_XY aPnt;
+
+  GetLeftPoint( aPnt, false );
+  aPnt += aDelta;
+  SetLeftPoint( aPnt, false );
+
+  GetRightPoint( aPnt, false );
+  aPnt += aDelta;
+  SetRightPoint( aPnt, false );
+}