Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix warnings due to depreciation of header FixedConstraint.h #136

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Fix warnings due to depreciation of header FixedConstraint.h #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BeamAdapter/component/constraint/AdaptiveBeamSlidingConstraint.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void AdaptiveBeamSlidingConstraint<DataTypes>::buildConstraintMatrix(const Const

Transform Tnode0, Tnode1, Tresult;
Real baryCoord;
unsigned int beam;
unsigned int beam = 0;

ReadAccessor<Data<VecCoord> > x1free=mstate1->read(ConstVecCoordId::freePosition()) ;
ReadAccessor<Data<VecCoord> > x2free=mstate2->read(ConstVecCoordId::freePosition()) ;
Expand Down
4 changes: 2 additions & 2 deletions src/BeamAdapter/component/controller/AdaptiveBeamController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

//////////////////////// Inclusion of headers...from wider to narrower/closer //////////////////////
#include <sofa/component/controller/MechanicalStateController.h>
#include <sofa/component/constraint/projective/FixedConstraint.h>
#include <sofa/component/constraint/projective/FixedProjectiveConstraint.h>
#include <sofa/component/collision/geometry/PointModel.h>
#include <sofa/component/collision/geometry/LineModel.h>

Expand All @@ -58,7 +58,7 @@ namespace sofa::component::controller
namespace _adaptivebeamcontroller_
{

using sofa::component::constraint::projective::FixedConstraint ;
using sofa::component::constraint::projective::FixedProjectiveConstraint;
using sofa::component::topology::container::dynamic::EdgeSetTopologyModifier ;
using sofa::component::topology::container::dynamic::EdgeSetGeometryAlgorithms ;
using sofa::component::fem::BeamInterpolation ;
Expand Down
6 changes: 3 additions & 3 deletions src/BeamAdapter/component/controller/InterventionalRadiologyController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <sofa/component/controller/MechanicalStateController.h>
#include <sofa/component/topology/container/dynamic/EdgeSetTopologyModifier.h>
#include <sofa/defaulttype/SolidTypes.h>
#include <sofa/component/constraint/projective/FixedConstraint.h>
#include <sofa/component/constraint/projective/FixedProjectiveConstraint.h>
#include <sofa/core/DataEngine.h>
#include <sofa/component/collision/geometry/PointModel.h>
#include <sofa/component/collision/geometry/LineModel.h>
Expand All @@ -55,7 +55,7 @@ namespace _interventionalradiologycontroller_
using sofa::type::Vec;
using sofa::type::Vec3d;
using sofa::core::topology::BaseMeshTopology;
using sofa::component::constraint::projective::FixedConstraint;
using sofa::component::constraint::projective::FixedProjectiveConstraint;

/*!
* \class InterventionalRadiologyController
Expand Down Expand Up @@ -179,7 +179,7 @@ class InterventionalRadiologyController : public MechanicalStateController<DataT

bool m_useBeamActions = false;
bool m_FF, m_RW, m_sensored;
FixedConstraint<DataTypes> * m_fixedConstraint;
FixedProjectiveConstraint<DataTypes> * m_fixedConstraint;
type::vector<Vec3d> m_sensorMotionData;
unsigned int m_currentSensorData;
type::vector<Real> m_nodeCurvAbs;
Expand Down
Loading