intersectWithTorus

Author: VibekeSkytt

gotools-core/include/GoTools/geometry/BoundedUtils.h

@@ -337,8 +337,8 @@ namespace BoundedUtils {
 
     std::vector<shared_ptr<CurveOnSurface> >
       intersectWithTorus(shared_ptr<ParamSurface>& surf,
-			 Point pnt, Point normal, double rad1,
-			 double rad2, double geom_tol);
+			 Point pnt, Point normal, double radius1,
+			 double radius2, double geom_tol);
 
     /// Find the intersction curve(s) between two parametric surfaces. The surfaces
   /// are represented as spline surface if this was not the case initially.

gotools-core/src/geometry/BoundedUtils.C

@@ -2713,8 +2713,8 @@ BoundedUtils::intersectWithCone(shared_ptr<ParamSurface>& surf,
 //===========================================================================
 vector<shared_ptr<CurveOnSurface> >
 BoundedUtils::intersectWithTorus(shared_ptr<ParamSurface>& surf,
-				 Point pnt, Point normal, double rad1,
-				 double rad2, double geom_tol)
+				 Point pnt, Point normal, double radius1,
+				 double radius2, double geom_tol)
 //===========================================================================
 {
     vector<shared_ptr<CurveOnSurface> > curves;
@@ -2741,7 +2741,7 @@ BoundedUtils::intersectWithTorus(shared_ptr<ParamSurface>& surf,
     SISLIntcurve** intcurves = 0;
     int stat;
     // Find the topology of the intersection
-    s1369(sislsf, pnt.begin(), normal.begin(), rad1, rad2, dim, epsco, 
+    s1369(sislsf, pnt.begin(), normal.begin(), radius1, radius2, dim, epsco, 
 	  geom_tol, &numintpt, &pointpar, &numintcr, &intcurves, &stat);
     // @@sbr Not sure this is the right solution. Maybe stat!=0 because of warning.
     ALWAYS_ERROR_IF(stat!=0,
@@ -2754,7 +2754,7 @@ BoundedUtils::intersectWithTorus(shared_ptr<ParamSurface>& surf,
 //     epsge = tol_.neighbour;
      for (int i = 0; i < numintcr; ++i) {
 	// March out the intersection curves
-       s1318(sislsf,pnt.begin(), normal.begin(), rad1, rad2, dim, epsco, 
+       s1318(sislsf,pnt.begin(), normal.begin(), radius1, radius2, dim, epsco, 
 	      geom_tol, maxstep, intcurves[i], makecurv, graphic, &stat);
 	SISLCurve* sc = intcurves[i]->pgeom;
 	if (sc == 0) {