diff --git a/src/Registration/ClosestPointRegistrationForceField.inl b/src/Registration/ClosestPointRegistrationForceField.inl index 2bff5e3..2de91a5 100644 --- a/src/Registration/ClosestPointRegistrationForceField.inl +++ b/src/Registration/ClosestPointRegistrationForceField.inl @@ -380,7 +380,7 @@ void ClosestPointRegistrationForceField::draw(const core::visual::Vis if (!vparams->displayFlags().getShowForceFields() && !drawColorMap.getValue()) return; ReadAccessor< Data< VecCoord > > x(*this->getMState()->read(core::vec_id::read_access::position)); - //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + //const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); unsigned int nb = this->closestPos.size(); if (vparams->displayFlags().getShowForceFields()) diff --git a/src/Registration/IntensityProfileRegistrationForceField.inl b/src/Registration/IntensityProfileRegistrationForceField.inl index 5c880a8..7c5d4ce 100644 --- a/src/Registration/IntensityProfileRegistrationForceField.inl +++ b/src/Registration/IntensityProfileRegistrationForceField.inl @@ -114,8 +114,8 @@ void IntensityProfileRegistrationForceField::init() if(this->mstate) { - const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); - //RDataRefVecCoord x(*this->getMState()->read(core::ConstVecCoordId::position())); + const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); + //RDataRefVecCoord x(*this->getMState()->read(core::vec_id::read_access::position)); RDataRefVecCoord dir(this->directions); if (dir.size() != x.size()) @@ -158,8 +158,8 @@ void IntensityProfileRegistrationForceField::udpateProfile // get current data const CImg& img = in->getCImg(t); const VecCoord& pos = (ref? - this->mstate->read(core::ConstVecCoordId::restPosition())->getValue(): - this->mstate->read(core::ConstVecCoordId::position())->getValue()); + this->mstate->read(core::vec_id::read_access::restPosition)->getValue(): + this->mstate->read(core::vec_id::read_access::position)->getValue()); const RDataRefVecCoord dir(ref?this->refDirections:this->directions); if(dir.size() != pos.size()) return; @@ -250,7 +250,7 @@ void IntensityProfileRegistrationForceField::udpateSimilar if( IP->isEmpty() || IPref->isEmpty() || !this->mstate) return; - const VecCoord& pos = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + const VecCoord& pos = this->mstate->read(core::vec_id::read_access::position)->getValue(); const CImg& prof = IP->getCImg(0); const CImg& profref = IPref->getCImg(0); @@ -471,8 +471,8 @@ void IntensityProfileRegistrationForceField::draw(const co if (!vparams->displayFlags().getShowForceFields()) return; - RDataRefVecCoord x(*this->getMState()->read(core::ConstVecCoordId::position())); - //const VecCoord& x = this->mstate->read(core::ConstVecCoordId::position())->getValue(); + RDataRefVecCoord x(*this->getMState()->read(core::vec_id::read_access::position)); + //const VecCoord& x = this->mstate->read(core::vec_id::read_access::position)->getValue(); unsigned int nb = this->targetPos.size(); if (vparams->displayFlags().getShowForceFields())