refs #430: incorrect coordinates in dump polyline

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

diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index 6239b431bfb24027bc578ebc2625d39a72711e63..dd246a236cf10f997593f3f798c6311ee56f41e2 100644 (file)
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -34,19 +34,53 @@ HYDROData_Polyline3D::~HYDROData_Polyline3D()
 QStringList HYDROData_Polyline3D::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
 {
   QStringList aResList = dumpObjectCreation( theTreatedObjects );
-  QString aName = GetObjPyName();
+  QString aPolylineName = GetObjPyName();
 
   Handle(HYDROData_PolylineXY) aRefPolyline = GetPolylineXY();
   setPythonReferenceObject( theTreatedObjects, aResList, aRefPolyline, "SetPolylineXY" );
 
-  Handle(HYDROData_ProfileUZ) aRefProfile = GetProfileUZ();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefProfile, "SetProfileUZ" );
-
-  Handle(HYDROData_IAltitudeObject) aRefBathymetry = GetAltitudeObject();
-  setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetAltitudeObject" );
+  Handle(HYDROData_ProfileUZ) aRefProfileUZ = GetProfileUZ();
+  if ( !aRefProfileUZ.IsNull() )
+  {
+    Handle(HYDROData_Profile) aProfile = 
+      Handle(HYDROData_Profile)::DownCast( aRefProfileUZ->GetFatherObject() );
+    if ( checkObjectPythonDefinition( theTreatedObjects, aResList, aProfile ) )
+    {
+      QString aProfileName = aProfile->GetObjPyName();
+      if ( !aProfileName.isEmpty() )
+      {
+        aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() );" )
+                     .arg( aPolylineName ).arg( aProfileName );
+      }
+    }
+  }
+  else
+  {
+    Handle(HYDROData_IAltitudeObject) aRefBathymetry = GetAltitudeObject();
+    if ( !aRefBathymetry.IsNull() )
+    {
+      Handle(HYDROData_ProfileUZ) aChildProfileUZ = GetChildProfileUZ();
+      if ( !aChildProfileUZ.IsNull() )
+      {
+        Handle(HYDROData_Profile) aProfile = 
+          Handle(HYDROData_Profile)::DownCast( aChildProfileUZ->GetFatherObject() );
+        if ( checkObjectPythonDefinition( theTreatedObjects, aResList, aProfile ) )
+        {
+          QString aProfileName = aProfile->GetObjPyName();
+          if ( !aProfileName.isEmpty() )
+          {
+            aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() );" )
+                         .arg( aPolylineName ).arg( aProfileName );
+          }
+        }
+      }
+
+      setPythonReferenceObject( theTreatedObjects, aResList, aRefBathymetry, "SetAltitudeObject" );
+    }
+  }
 
   aResList << QString( "" );
-  aResList << QString( "%1.Update();" ).arg( aName );
+  aResList << QString( "%1.Update();" ).arg( aPolylineName );
   aResList << QString( "" );
 
   return aResList;
@@ -291,12 +325,17 @@ Handle(HYDROData_ProfileUZ) HYDROData_Polyline3D::GetChildProfileUZ( const bool
 
   aProfileUZ = aProfile->GetProfileUZ();
 
-  Handle(HYDROData_Polyline3D) me = this;
-  me->SetReferenceObject( aProfileUZ, DataTag_ChildProfileUZ );
+  HYDROData_Polyline3D* me = const_cast<HYDROData_Polyline3D*>( this ); // Temporary to be revised
+  me->SetChildProfileUZ( aProfileUZ );
 
   return aProfileUZ;
 }
 
+void HYDROData_Polyline3D::SetChildProfileUZ( const Handle(HYDROData_ProfileUZ)& theProfile )
+{
+  SetReferenceObject( theProfile, DataTag_ChildProfileUZ );
+}
+
 HYDROData_IPolyline::PointsList generateProfileUZPoints(
   const Handle(HYDROData_PolylineXY)&      thePolyline,
   const Handle(HYDROData_IAltitudeObject)& theAltitude )