[PATCH] add getName to OperationInterfacePart

Submitted by markus.klotzbuecher on Thu, 2010-10-14 15:36

RTT-dev

This patch allows to use OperationInterfacePart's as a counterpart for
Luas Operation class.

---
rtt/OperationInterfacePart.hpp | 6 ++++++
rtt/internal/OperationInterfacePartFused.hpp | 12 ++++++++++++
rtt/scripting/FunctionFactory.cpp | 4 ++++
rtt/scripting/FunctionFactory.hpp | 2 ++
.../corba/CorbaOperationCallerFactory.cpp | 4 ++++
.../corba/CorbaOperationCallerFactory.hpp | 2 ++
6 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/rtt/OperationInterfacePart.hpp b/rtt/OperationInterfacePart.hpp
index d9fca5d..7785d82 100644
--- a/rtt/OperationInterfacePart.hpp
+++ b/rtt/OperationInterfacePart.hpp
@@ -72,6 +72,12 @@ namespace RTT
RTT_API virtual ~OperationInterfacePart();

/**
+ * Returns the name of this operation.
+ * @return
+ */
+ virtual std::string getName() const = 0;
+
+ /**
* Returns the description of this operation.
* @return
*/
diff --git a/rtt/internal/OperationInterfacePartFused.hpp b/rtt/internal/OperationInterfacePartFused.hpp
index da25e15..8ca0c39 100644
--- a/rtt/internal/OperationInterfacePartFused.hpp
+++ b/rtt/internal/OperationInterfacePartFused.hpp
@@ -105,6 +105,10 @@ namespace RTT
{
}

+ virtual std::string getName() const {
+ return op->getName();
+ }
+
virtual std::string description() const {
return OperationInterfacePartHelper::description( op );
}
@@ -221,6 +225,10 @@ namespace RTT
virtual base::DataSourceBase::shared_ptr produceHandle() const
{ throw no_asynchronous_operation_exception("cannot use produceHandle on synchronous operations"); }

+ virtual std::string getName() const {
+ return op->getName();
+ }
+
virtual std::string description() const {
return op->getDescriptions().front();
}
diff --git a/rtt/scripting/FunctionFactory.cpp b/rtt/scripting/FunctionFactory.cpp
index bb417be..978d398 100644
--- a/rtt/scripting/FunctionFactory.cpp
+++ b/rtt/scripting/FunctionFactory.cpp
@@ -69,6 +69,10 @@ namespace RTT {
return func->getResult() ? func->getResult()->getDataSource()->getTypeName() : "void";
}

+ std::string FunctionFactory::getName() const {
+ return func->getName();
+ }
+
std::string FunctionFactory::description() const {
return "Orocos Program Script Function.";
}
diff --git a/rtt/scripting/FunctionFactory.hpp b/rtt/scripting/FunctionFactory.hpp
index 6f1fff5..fb34d23 100644
--- a/rtt/scripting/FunctionFactory.hpp
+++ b/rtt/scripting/FunctionFactory.hpp
@@ -72,6 +72,8 @@ namespace RTT

const types::TypeInfo* getCollectType(unsigned int arg) const;

+ std::string getName() const;
+
std::string description() const;

std::vector< ArgumentDescription > getArgumentList() const;
diff --git a/rtt/transports/corba/CorbaOperationCallerFactory.cpp b/rtt/transports/corba/CorbaOperationCallerFactory.cpp
index 5489976..d892162 100644
--- a/rtt/transports/corba/CorbaOperationCallerFactory.cpp
+++ b/rtt/transports/corba/CorbaOperationCallerFactory.cpp
@@ -106,6 +106,10 @@ std::string CorbaOperationCallerFactory::resultType() const {
return std::string();
}

+std::string CorbaOperationCallerFactory::getName() const {
+ return method;
+}
+
std::string CorbaOperationCallerFactory::description() const {
try {
CORBA::String_var result = mfact->getDescription( method.c_str() );
diff --git a/rtt/transports/corba/CorbaOperationCallerFactory.hpp b/rtt/transports/corba/CorbaOperationCallerFactory.hpp
index 6babdd3..b401be0 100644
--- a/rtt/transports/corba/CorbaOperationCallerFactory.hpp
+++ b/rtt/transports/corba/CorbaOperationCallerFactory.hpp
@@ -84,6 +84,8 @@ namespace RTT

virtual std::string resultType() const;

+ virtual std::string getName() const;
+
virtual std::string description() const;

virtual std::vector< ArgumentDescription > getArgumentList() const;

[PATCH] add getName to OperationInterfacePart

Submitted by markus.klotzbuecher on Fri, 2010-10-22 13:48.

Hi Peter,

On Thu, Oct 14, 2010 at 05:34:13PM +0200, Markus Klotzbuecher wrote:
> This patch allows to use OperationInterfacePart's as a counterpart for
> Luas Operation class.
>
> ---
> rtt/OperationInterfacePart.hpp | 6 ++++++
> rtt/internal/OperationInterfacePartFused.hpp | 12 ++++++++++++
> rtt/scripting/FunctionFactory.cpp | 4 ++++
> rtt/scripting/FunctionFactory.hpp | 2 ++
> .../corba/CorbaOperationCallerFactory.cpp | 4 ++++
> .../corba/CorbaOperationCallerFactory.hpp | 2 ++
> 6 files changed, 30 insertions(+), 0 deletions(-)