Fix wrapping of double & output arguments

[acoussat]

The problem is that in the method rtkConvexShape::IsIntersectedByRay(const PointType &, const VectorType &, double &, double &), the last two parameters are meant to be output values, and thus cannot be used in Python, since there is no way to define a double & in Python.

The solution, crafted thanks to the pointers given by @SimonRit and this comment from @LucasGandel, removes the last two parameters from the method in Python and replaces them with output values (see example below). There might be a better way of achieving the same result, but I am far from fluent in SWIG, so any suggestion of improvement is welcome!

Test script:

import itk
from itk import RTK as rtk

q = rtk.QuadricShape.New()

# Define a sphere of radius 10
radius = 10
q.SetA(1)
q.SetB(1)
q.SetC(1)
q.SetJ(-radius**2)

print(q.IsIntersectedByRay([-20,0,0],[1,0,0]))  # only two parameters

Output with the fix:

[True, 10.0, 30.0]

[SimonRit]

Thanks, great work. I'm not fluent in swig so I trust it's very well written :-). However, I speak a bit of cmake and it is meaning less to use configure_file here as there is nothing to configure (cmake variables with @, see other .in files)... Can you rename ConvexShape.i.in to ConvexShape.i and replace ${CMAKE_CURRENT_BINARY_DIR}/ConvexShape.i by ${CMAKE_CURRENT_SOURCE_DIR}/ConvexShape.i please?

[acoussat]

Thanks for the comment. As we discussed, we can also implement the same fix for all the relevant double & in RTK. You told me about the ones in rtkFieldOfViewImageFilter::ComputeFOVRadius, shall we prepare a small list? We can also deal with int & or float & if they also appear.

[SimonRit]

Thanks for the comment. As we discussed, we can also implement the same fix for all the relevant double & in RTK. You told me about the ones in rtkFieldOfViewImageFilter::ComputeFOVRadius, shall we prepare a small list? We can also deal with int & or float & if they also appear.

I used the following search grep -rE '\s*(short|double|int|float|string) *&' include/*h -B2 and found in addtion to IsIntersectedByRay (excluding const ones)

• rtk::FieldOfViewImageFilter::ComputeFOVRadius
• rtk::ThreeDCircularProjectionGeometry::FixAngles

[SimonRit]

Please also rebase on master to fix the CI.

[acoussat]

I haven't completely tested it, maybe I first try to make sure that it works properly before merging it.