refs #493: fix bugs

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ProfileInterpolateOp.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
index dab1a59e4f123294089f5b96f0098d605960e4bc..7caefc3b9a22c621b75f3b40431c67b9bb0df118 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ProfileInterpolateOp.cxx
@@ -136,7 +136,7 @@ bool HYDROGUI_ProfileInterpolateOp::processApply( int& theUpdateFlags, QString&
         if ( !aRiver.IsNull() )
         {
             startDocOperation();
-            //aRiver->Interpolate( anIterp );
+            aRiver->Interpolate( anIterp );
             if ( anIterp->GetErrorCode() == OK )
                 commitDocOperation();
             else
@@ -176,9 +176,10 @@ void HYDROGUI_ProfileInterpolateOp::updatePreview()
     if ( anIterp )
     {
         updateInterpolator( anIterp );
-        if ( anIterp->Calculate() == OK )
+        anIterp->Calculate();
+        if ( anIterp->GetErrorCode() == OK )
         {
-            TopoDS_Shape aShape = previewShape( anIterp, aDlg->profileNumber() );
+            TopoDS_Shape aShape = previewShape( anIterp );
             if ( !aShape.IsNull() )
             {
                 myPreview = new AIS_Shape( aShape );
@@ -284,22 +285,22 @@ HYDROData_IProfilesInterpolator* HYDROGUI_ProfileInterpolateOp::interpolator( co
     return aRes;
 }
 
-TopoDS_Shape HYDROGUI_ProfileInterpolateOp::previewShape( HYDROData_IProfilesInterpolator* theInterp, int theNumber ) const
+TopoDS_Shape HYDROGUI_ProfileInterpolateOp::previewShape( HYDROData_IProfilesInterpolator* theInterp ) const
 {
     TopoDS_Compound aPreviewShape;
     if ( theInterp )
     {
         BRep_Builder aBuilder;
         aBuilder.MakeCompound( aPreviewShape );
-        for ( int i = 0; i < theNumber; i++ )
+        for ( int i = 0; i < theInterp->GetCalculatedProfilesNumber(); i++ )
         {
             NCollection_Sequence<gp_XYZ> pointSeq;
             std::vector<double> aPoints = theInterp->GetResultProfile( i );
-            for ( int i = 0; i < aPoints.size(); i += 3 )
+            for ( int i = 0; i < (int) aPoints.size(); i += 3 )
                 pointSeq.Append( gp_XYZ( aPoints[i], aPoints[i+1], aPoints[i+2] ) );
             TopoDS_Shape aWire = HYDROData_PolylineXY::BuildWire( HYDROData_IPolyline::SECTION_SPLINE, false, pointSeq );
             if ( !aWire.IsNull() )
-                aBuilder.Add( aWire, aPreviewShape );
+                aBuilder.Add( aPreviewShape, aWire );
         }
     }