Import/Export // API revision. p4

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

diff --git a/src/HYDROData/HYDROData_PolylineXY.cxx b/src/HYDROData/HYDROData_PolylineXY.cxx
index 32f2ddabdc1d7a21e19920f2f29c3dbb76db9f6f..ab34af79f43deed24ab133afe4d9a5b132fd7bec 100755 (executable)
--- a/src/HYDROData/HYDROData_PolylineXY.cxx
+++ b/src/HYDROData/HYDROData_PolylineXY.cxx
@@ -247,6 +247,12 @@ TopoDS_Shape HYDROData_PolylineXY::GetShape() const
   return getPolylineShape();
 }
 
+bool HYDROData_PolylineXY::SetShape( const TopoDS_Shape& theShape )
+{
+  setPolylineShape( theShape );
+  return true;
+}
+
 bool convertEdgeToSection( const TopoDS_Edge&                                       theEdge,
                            NCollection_Sequence<TCollection_AsciiString>&           theSectNames,
                            NCollection_Sequence<HYDROData_PolylineXY::SectionType>& theSectTypes,
@@ -428,9 +434,10 @@ TopoDS_Wire HYDROData_PolylineXY::BuildWire( const SectionType&
 
     if ( thePoints.Size() > 1 )
     {
-      HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+      Handle(Geom_BSplineCurve) aCurve = 
+        HYDROData_BSplineOperation::ComputeCurve( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
 
-      TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aBSpline.Curve() ).Edge();
+      TopoDS_Edge anEdge = BRepBuilderAPI_MakeEdge( aCurve ).Edge();
       aMakeWire.Add( anEdge );
     }
     aMakeWire.Build();
@@ -466,8 +473,9 @@ void HYDROData_PolylineXY::BuildPainterPath( QPainterPath&
   }
   else
   {
-    HYDROData_BSplineOperation aBSpline( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
-    aBSpline.ComputePath( thePath );
+    Handle(Geom_BSplineCurve) aCurve = 
+      HYDROData_BSplineOperation::ComputeCurve( thePoints, theIsClosed, LOCAL_SELECTION_TOLERANCE );
+    HYDROData_BSplineOperation::ComputePath( aCurve, thePath );
   }
 }
 
@@ -487,7 +495,7 @@ void HYDROData_PolylineXY::Update()
   NCollection_Sequence<bool>                              aSectClosures;
   GetSections( aSectNames, aSectTypes, aSectClosures );
 
-  BRepBuilderAPI_MakeWire aMakeWire;
+  //BRepBuilderAPI_MakeWire aMakeWire;
 
   TopTools_ListOfShape aSectionWiresList;
 
@@ -513,7 +521,7 @@ void HYDROData_PolylineXY::Update()
     TopoDS_Wire aSectionWire = BuildWire( aSectionType, anIsSectionClosed, aPoints );
     if ( !aSectionWire.IsNull() ) {
       aSectionWiresList.Append( aSectionWire );
-      aMakeWire.Add( aSectionWire );
+      //aMakeWire.Add( aSectionWire );
     }
   }
 // all input wires in the <aSectionWiresList>
@@ -655,18 +663,19 @@ double HYDROData_PolylineXY::GetDistance( const int theSectionIndex,
         aPointToTest = aPoint;
     }
 
-    HYDROData_BSplineOperation aBSpline( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE );
+    Handle(Geom_BSplineCurve) aCurve = 
+      HYDROData_BSplineOperation::ComputeCurve( aPoints, anIsSectionClosed, LOCAL_SELECTION_TOLERANCE );
 
-    Quantity_Parameter aFirstParam = aBSpline.Curve()->FirstParameter();
-    Quantity_Parameter aSecondParam = aBSpline.Curve()->LastParameter();
+    Quantity_Parameter aFirstParam = aCurve->FirstParameter();
+    Quantity_Parameter aSecondParam = aCurve->LastParameter();
 
     if ( thePointIndex != aSectNbPoints - 1 )
     {
-      GeomAPI_ProjectPointOnCurve aProject( aPointToTest, aBSpline.Curve() );
+      GeomAPI_ProjectPointOnCurve aProject( aPointToTest, aCurve );
       aSecondParam = aProject.LowerDistanceParameter();
     }
 
-    GeomAdaptor_Curve anAdap( aBSpline.Curve() );
+    GeomAdaptor_Curve anAdap( aCurve );
     
     aResDistance = GCPnts_AbscissaPoint::Length( anAdap, aFirstParam, aSecondParam );
   }