Skip to content
Snippets Groups Projects
Commit 3441b062 authored by Thomas Moulard's avatar Thomas Moulard Committed by olivier stasse
Browse files

Uses DYNAMIC_GRAPH_ENTITY_DECL() when needed.

parent 6b151490
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,6 @@ SET(NEWHEADERS
sot/core/op-point-modifier.hh
sot/core/vector-quaternion.hh
sot/core/vector-roll-pitch-yaw.hh
sot/core/feature-posture.h
sot/core/feature-point6d.hh
sot/core/feature-vector3.hh
sot/core/feature-abstract.hh
......
......@@ -50,6 +50,7 @@ template< class T >
class Derivator
:public dg::Entity
{
DYNAMIC_GRAPH_ENTITY_DECL();
protected:
T memory;
bool initialized;
......@@ -59,8 +60,7 @@ class Derivator
public: /* --- CONSTRUCTION --- */
static std::string getTypeName( void ) { return "Unknown"; }
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
static const std::string CLASS_NAME;
Derivator( const std::string& name )
: dg::Entity(name)
......
......@@ -61,6 +61,7 @@ namespace dg = dynamicgraph;
class SOTGRIPPERCONTROL_EXPORT GripperControl
{
DYNAMIC_GRAPH_ENTITY_DECL();
protected:
double offset;
......@@ -103,8 +104,8 @@ class SOTGRIPPERCONTROL_EXPORT GripperControl
class SOTGRIPPERCONTROL_EXPORT GripperControlPlugin
:public dg::Entity, public GripperControl
{
DYNAMIC_GRAPH_ENTITY_DECL();
public:
static const std::string CLASS_NAME;
bool calibrationStarted;
......@@ -112,7 +113,7 @@ class SOTGRIPPERCONTROL_EXPORT GripperControlPlugin
GripperControlPlugin( const std::string& name );
virtual ~GripperControlPlugin( void );
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
public: /* --- SIGNAL --- */
/* --- INPUTS --- */
......
......@@ -70,9 +70,7 @@ using dynamicgraph::sot::Flags;
class SOTREADER_EXPORT sotReader
: public Entity
{
public:
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
DYNAMIC_GRAPH_ENTITY_DECL();
public:
......
......@@ -65,9 +65,7 @@ namespace dynamicgraph {
class SOTSEQUENCER_EXPORT Sequencer
:public dynamicgraph::Entity
{
public:
static const std::string CLASS_NAME;
virtual const std::string& getClassName( void ) const { return CLASS_NAME; }
DYNAMIC_GRAPH_ENTITY_DECL();
public:
class sotEventAbstract
......
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