Skip to content

Commit

Permalink
remaining ConstVecCoordId replaced
Browse files Browse the repository at this point in the history
  • Loading branch information
hugtalbot authored and fredroy committed Feb 19, 2025
1 parent a934f49 commit 5a2f43e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/Registration/ClosestPointRegistrationForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ void ClosestPointRegistrationForceField<DataTypes>::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())
Expand Down
14 changes: 7 additions & 7 deletions src/Registration/IntensityProfileRegistrationForceField.inl
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ void IntensityProfileRegistrationForceField<DataTypes,ImageTypes>::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())
Expand Down Expand Up @@ -158,8 +158,8 @@ void IntensityProfileRegistrationForceField<DataTypes,ImageTypes>::udpateProfile
// get current data
const CImg<T>& 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;

Expand Down Expand Up @@ -250,7 +250,7 @@ void IntensityProfileRegistrationForceField<DataTypes,ImageTypes>::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<T>& prof = IP->getCImg(0);
const CImg<T>& profref = IPref->getCImg(0);

Expand Down Expand Up @@ -471,8 +471,8 @@ void IntensityProfileRegistrationForceField<DataTypes,ImageTypes>::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())
Expand Down

0 comments on commit 5a2f43e

Please sign in to comment.