diff --git a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h index 7b3a484be8da8e29aed11b12833fa8c9764577a1..ac7b028fe48f331affb88f65d02b88add825e87e 100644 --- a/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h +++ b/source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h @@ -153,6 +153,19 @@ namespace armarx virtual public NJointControllerInterface, virtual public ManagedIceObject { + // //////////////////////////////////////////////////////////////////////////////////////// // + // /////////////////////////////////////// typedefs /////////////////////////////////////// // + // //////////////////////////////////////////////////////////////////////////////////////// // + public: + using ConfigPtrT = NJointControllerConfigPtr; + using GenerateConfigDescriptionFunctionSignature = WidgetDescription::WidgetPtr(*) + ( + const boost::shared_ptr<VirtualRobot::Robot>&, + const std::map<std::string, ConstControlDevicePtr>& controlDevices, + const std::map<std::string, ConstSensorDevicePtr>& sensorDevices + ); + template<class ConfigPrtType> + using GenerateConfigFromVariantsFunctionSignature = ConfigPrtType(*)(const StringVariantBaseMap&); // //////////////////////////////////////////////////////////////////////////////////////// // // ///////////////////////////// constructor setup functions ////////////////////////////// // // //////////////////////////////////////////////////////////////////////////////////////// // @@ -348,29 +361,6 @@ namespace armarx public: - using ConfigPtrT = NJointControllerConfigPtr; - //add these static functions if you want to provide a gui for construction - // static WidgetDescription::WidgetPtr GenerateConfigDescription - // ( - // const boost::shared_ptr<VirtualRobot::Robot>&, - // const std::map<std::string, ConstControlDevicePtr>& controlDevices, - // const std::map<std::string, ConstSensorDevicePtr>& sensorDevices - // ) - // { - // return a nullptr / Widget if you want remote configuration but do not need any parameters - // } - // static ConfigPtrT GenerateConfigFromVariants(const StringVariantBaseMap&) - // { - // return the config that is passed to your controller - // } - using GenerateConfigDescriptionFunctionSignature = WidgetDescription::WidgetPtr(*) - ( - const boost::shared_ptr<VirtualRobot::Robot>&, - const std::map<std::string, ConstControlDevicePtr>& controlDevices, - const std::map<std::string, ConstSensorDevicePtr>& sensorDevices - ); - template<class ConfigPrtType> - using GenerateConfigFromVariantsFunctionSignature = ConfigPrtType(*)(const StringVariantBaseMap&); static const NJointControllerPtr NullPtr;