Skip to content
Snippets Groups Projects
Commit 6607b419 authored by Florent Lamiraux's avatar Florent Lamiraux
Browse files

Make member fromSensor private and add setter and getter.

     * include/sot-dynamic/angle-estimator.h,
     * src/angle-estimator.cpp: rename member fromSensor -> fromSensor_.
parent 4a4e1fe1
No related branches found
No related tags found
1 merge request!1[major][cpp] starting point to integrate pinocchio
......@@ -103,7 +103,14 @@ class SOTANGLEESTIMATOR_EXPORT AngleEstimator
const int& time );
public: /* --- PARAMS --- */
bool fromSensor;
void fromSensor(const bool& inFromSensor) {
fromSensor_ = fromSensor;
}
bool fromSensor() const {
return fromSensor_;
}
private:
bool fromSensor_;
virtual void commandLine( const std::string& cmdLine,
std::istringstream& cmdArgs,
......
......@@ -73,7 +73,7 @@ AngleEstimator( const std::string & name )
"sotAngleEstimator("+name
+")::output(vectorRollPitchYaw)::waistWorldPoseRPY" )
,fromSensor(true)
,fromSensor_(true)
{
sotDEBUGIN(5);
......@@ -267,7 +267,7 @@ computeWaistWorldPosition( MatrixHomogeneous& res,
const MatrixHomogeneous & waistMleg = contactEmbeddedPositionSIN( time );
MatrixHomogeneous legMwaist; waistMleg.inverse( legMwaist );
if( fromSensor )
if( fromSensor_ )
{
const MatrixRotation & Rflex = flexibilitySOUT( time ); // footRleg
ml::Vector zero(3); zero.fill(0.);
......@@ -316,9 +316,9 @@ commandLine( const std::string& cmdLine,
std::string val; cmdArgs>>val;
if( ("true"==val)||("false"==val) )
{
fromSensor = ( val=="true" );
fromSensor_ = ( val=="true" );
} else {
os << "fromSensor = " << (fromSensor?"true":"false") << std::endl;
os << "fromSensor = " << (fromSensor_?"true":"false") << std::endl;
}
}
else { Entity::commandLine( cmdLine,cmdArgs,os); }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment