Skip to content

Commit fbe6ba4

Browse files
Noëlie Ramuzatolivier-stasse
Noëlie Ramuzat
authored andcommitted
[signal] Fix the signals' names to respect macros
Adding prefix m_ to the input and output signals' names. The names respect the following macros: * m_nameSIN for input signals. * m_nameSOUT for output signals.
1 parent 7939628 commit fbe6ba4

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/feature/visual-point-projecter.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ namespace dynamicgraph
2828
,CONSTRUCT_SIGNAL_IN(point3D,dynamicgraph::Vector)
2929
,CONSTRUCT_SIGNAL_IN(transfo,MatrixHomogeneous)
3030

31-
,CONSTRUCT_SIGNAL_OUT(point3Dgaze,dynamicgraph::Vector,point3DSIN<<transfoSIN )
32-
,CONSTRUCT_SIGNAL_OUT(depth,double,point3DgazeSOUT )
33-
,CONSTRUCT_SIGNAL_OUT(point2D,dynamicgraph::Vector,point3DgazeSOUT<<depthSOUT )
31+
,CONSTRUCT_SIGNAL_OUT(point3Dgaze,dynamicgraph::Vector,m_point3DSIN<<m_transfoSIN )
32+
,CONSTRUCT_SIGNAL_OUT(depth,double,m_point3DgazeSOUT )
33+
,CONSTRUCT_SIGNAL_OUT(point2D,dynamicgraph::Vector,m_point3DgazeSOUT<<m_depthSOUT )
3434
{
35-
Entity::signalRegistration( point3DSIN );
36-
Entity::signalRegistration( transfoSIN );
37-
Entity::signalRegistration( point3DgazeSOUT );
38-
Entity::signalRegistration( point2DSOUT );
39-
Entity::signalRegistration( depthSOUT );
35+
Entity::signalRegistration( m_point3DSIN );
36+
Entity::signalRegistration( m_transfoSIN );
37+
Entity::signalRegistration( m_point3DgazeSOUT );
38+
Entity::signalRegistration( m_point2DSOUT );
39+
Entity::signalRegistration( m_depthSOUT );
4040
}
4141

4242

@@ -47,8 +47,8 @@ namespace dynamicgraph
4747
dynamicgraph::Vector& VisualPointProjecter::
4848
point3DgazeSOUT_function( dynamicgraph::Vector &p3g, int iter )
4949
{
50-
const dynamicgraph::Vector & p3 = point3DSIN(iter);
51-
const MatrixHomogeneous & M = transfoSIN(iter);
50+
const dynamicgraph::Vector & p3 = m_point3DSIN(iter);
51+
const MatrixHomogeneous & M = m_transfoSIN(iter);
5252
MatrixHomogeneous Mi; Mi = M.inverse(Eigen::Affine);
5353
p3g = Mi.matrix()*p3;
5454
return p3g;
@@ -59,8 +59,8 @@ namespace dynamicgraph
5959
{
6060
sotDEBUGIN(15);
6161

62-
const dynamicgraph::Vector & p3 = point3DgazeSOUT(iter);
63-
const double &z =depthSOUT(iter);
62+
const dynamicgraph::Vector & p3 = m_point3DgazeSOUT(iter);
63+
const double &z =m_depthSOUT(iter);
6464
assert(z>0);
6565

6666
p2.resize(2);
@@ -74,7 +74,7 @@ namespace dynamicgraph
7474
double& VisualPointProjecter::
7575
depthSOUT_function( double & z, int iter )
7676
{
77-
const dynamicgraph::Vector & p3 = point3DgazeSOUT(iter);
77+
const dynamicgraph::Vector & p3 = m_point3DgazeSOUT(iter);
7878
assert(p3.size() == 3);
7979
z=p3(2);
8080
return z;

0 commit comments

Comments
 (0)