From 8243fa589897e34dae644be3357c50b1d3b2697e Mon Sep 17 00:00:00 2001 From: Hugo Date: Fri, 21 Jul 2023 14:21:50 +0200 Subject: [PATCH] Fix warning using OptionGroup and Vec3 (#8) --- .../IntensityProfileRegistrationForceField.inl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Registration/IntensityProfileRegistrationForceField.inl b/src/Registration/IntensityProfileRegistrationForceField.inl index e6a930c..3e2fda5 100644 --- a/src/Registration/IntensityProfileRegistrationForceField.inl +++ b/src/Registration/IntensityProfileRegistrationForceField.inl @@ -77,11 +77,11 @@ IntensityProfileRegistrationForceField::IntensityProfileR , showArrowSize(initData(&showArrowSize,0.01f,"showArrowSize","size of the axis")) , drawMode(initData(&drawMode,0,"drawMode","The way springs will be drawn:\n- 0: Line\n- 1:Cylinder\n- 2: Arrow")) { - helper::OptionsGroup InterpolationOptions(3,"Nearest", "Linear", "Cubic"); + helper::OptionsGroup InterpolationOptions{"Nearest", "Linear", "Cubic"}; InterpolationOptions.setSelectedItem(INTERPOLATION_LINEAR); Interpolation.setValue(InterpolationOptions); - helper::OptionsGroup MeasureOptions(2,"Sum of square differences", "Normalized cross correlation"); + helper::OptionsGroup MeasureOptions{"Sum of square differences", "Normalized cross correlation"}; MeasureOptions.setSelectedItem(SIMILARITY_NCC); SimilarityMeasure.setValue(MeasureOptions); @@ -477,11 +477,11 @@ void IntensityProfileRegistrationForceField::draw(const co unsigned int nb = this->targetPos.size(); if (vparams->displayFlags().getShowForceFields()) { - std::vector< type::Vector3 > points; + std::vector< type::Vec3 > points; for (unsigned int i=0; itargetPos[i]); + type::Vec3 point1 = DataTypes::getCPos(x[i]); + type::Vec3 point2 = DataTypes::getCPos(this->targetPos[i]); points.push_back(point1); points.push_back(point2); }