mask traces

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

diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index 7067348006ac05e783f19761fffc906d62532084..7ce105bb3877014a583ff8a5dc6b632f074e60e5 100644 (file)
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -50,10 +50,12 @@
 
 #include <TopTools_SequenceOfShape.hxx>
 
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
 #include <QColor>
 #include <QStringList>
 
-IMPLEMENT_STANDARD_HANDLE(HYDROData_Polyline3D,HYDROData_Object)
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Polyline3D,HYDROData_Object)
 
 
@@ -85,7 +87,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath,
       QString aProfileName = aProfile->GetObjPyName();
       if ( !aProfileName.isEmpty() )
       {
-        aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() );" )
+        aResList << QString( "%1.SetProfileUZ( %2.GetProfileUZ() )" )
                      .arg( aPolylineName ).arg( aProfileName );
       }
     }
@@ -105,7 +107,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath,
           QString aProfileName = aProfile->GetObjPyName();
           if ( !aProfileName.isEmpty() )
           {
-            aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() );" )
+            aResList << QString( "%1.SetChildProfileUZ( %2.GetProfileUZ() )" )
                          .arg( aPolylineName ).arg( aProfileName );
           }
         }
@@ -116,7 +118,7 @@ QStringList HYDROData_Polyline3D::DumpToPython( const QString& thePyScriptPath,
   }
 
   aResList << QString( "" );
-  aResList << QString( "%1.Update();" ).arg( aPolylineName );
+  aResList << QString( "%1.Update()" ).arg( aPolylineName );
   aResList << QString( "" );
 
   return aResList;
@@ -151,9 +153,22 @@ void HYDROData_Polyline3D::Update()
 
   bool anIsSectionClosed = aPolylineXY->IsClosedSection( 0 );
   HYDROData_IPolyline::SectionType aSectionType = aPolylineXY->GetSectionType( 0 );
+  NCollection_Sequence<Polyline3DPoint> aResPoints = GetProfilePoints3D(false);
+
+  TopoDS_Wire aResWire = HYDROData_PolylineXY::BuildWire( aSectionType, anIsSectionClosed, aResPoints );
+  SetTopShape( aResWire );
+  SetShape3D( aResWire );
+} 
+
+HYDROData_Polyline3D::Polyline3DPoints HYDROData_Polyline3D::GetProfilePoints3D(bool IsConvertToGlobal)
+{
+  Handle(HYDROData_PolylineXY) aPolylineXY = GetPolylineXY();
+  if ( aPolylineXY.IsNull() )
+    return Polyline3DPoints();
+
   HYDROData_IPolyline::PointsList aPolylinePoints = aPolylineXY->GetPoints( 0 );
   if ( aPolylinePoints.IsEmpty() )
-    return;
+    return Polyline3DPoints();
 
   Handle(HYDROData_ProfileUZ) aProfileUZ = GetProfileUZ();
 
@@ -162,11 +177,11 @@ void HYDROData_Polyline3D::Update()
     aProfileUZ = GetChildProfileUZ();
 
   if ( aProfileUZ.IsNull() )
-    return;
+    return Polyline3DPoints();
 
   HYDROData_IPolyline::PointsList aProfilePoints = aProfileUZ->GetPoints();
   if ( aProfilePoints.IsEmpty() )
-    return;
+    return NCollection_Sequence<HYDROData_Polyline3D::Polyline3DPoint>();
 
   const HYDROData_IPolyline::Point& aFirstPoint = aPolylinePoints.First();
   const HYDROData_IPolyline::Point& aLastPoint = aPolylinePoints.Last();
@@ -198,10 +213,17 @@ void HYDROData_Polyline3D::Update()
   // Add last point as is
   aResPoints.Append( Polyline3DPoint( aLastPoint.X(), aLastPoint.Y(), aLastParPoint.Y() ) );
 
-  TopoDS_Wire aResWire = HYDROData_PolylineXY::BuildWire( aSectionType, anIsSectionClosed, aResPoints );
-  SetTopShape( aResWire );
-  SetShape3D( aResWire );
-} 
+  if (IsConvertToGlobal)
+  {
+    Handle(HYDROData_Document) aDoc = HYDROData_Document::Document();
+    for (int i=1;i<=aResPoints.Size();i++)
+    {
+      gp_XYZ& point = aResPoints.ChangeValue(i);
+      aDoc->Transform( point, false );
+    }
+  }
+  return aResPoints;
+}
 
 QColor HYDROData_Polyline3D::DefaultFillingColor() const
 {
@@ -327,7 +349,7 @@ Handle(HYDROData_ProfileUZ) HYDROData_Polyline3D::GetChildProfileUZ( const bool
   if ( !theIsCreate || !aProfileUZ.IsNull() )
     return aProfileUZ;
 
-  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
+  Handle(HYDROData_Document) aDocument = HYDROData_Document::Document();
   if ( aDocument.IsNull() )
     return aProfileUZ;