diff --git a/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp b/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp index 92005dea9a32122b5e447d60436332286e1625dd..d55f7356304ccfb037d43b53bcf7cb26cc18b88f 100644 --- a/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp +++ b/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp @@ -155,12 +155,9 @@ namespace armarx::RemoteGui .addChild(new RemoteGui::HSpacer) ); } -} -namespace armarx::RemoteGui::detail::_getValue -{ - void GetValueOutputParameter <CartesianWaypointControllerConfig, void>::call( - CartesianWaypointControllerConfig& cfg, - RemoteGui::ValueMap const& values, std::string const& name) + + void getValue(CartesianWaypointControllerConfig& cfg, + RemoteGui::ValueMap const& values, std::string const& name) { cfg.maxPositionAcceleration = getValue<float>(values, name + "_maxAcc_Pos"); cfg.maxOrientationAcceleration = getValue<float>(values, name + "_maxAcc_Ori"); diff --git a/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.h b/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.h index ca43720fa07154d3067941a7f9ec496f2e43bd26..5f1ff1c435217d0bd7fd0758c259c0ab8847d15b 100644 --- a/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.h +++ b/source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.h @@ -31,15 +31,7 @@ namespace armarx::RemoteGui detail::GroupBoxBuilder makeConfigGui( const std::string& name, const CartesianWaypointControllerConfig& val); -} -namespace armarx::RemoteGui::detail::_getValue -{ - template<> - struct GetValueOutputParameter <CartesianWaypointControllerConfig, void> : std::true_type - { - static void call( - CartesianWaypointControllerConfig& cfg, - RemoteGui::ValueMap const& values, std::string const& name); - }; + void getValue(CartesianWaypointControllerConfig& cfg, + RemoteGui::ValueMap const& values, std::string const& name); } diff --git a/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.cpp b/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.cpp index fece7f9254cc646114adec271f5c931a92b47432..c360d51b4e0e4fd5ac3fd2eeb3130ce44f569d34 100644 --- a/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.cpp +++ b/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.cpp @@ -49,12 +49,9 @@ namespace armarx::RemoteGui return builder; } -} -namespace armarx::RemoteGui::detail::_getValue -{ - void GetValueOutputParameter <NJointCartesianWaypointControllerRuntimeConfig, void>::call( - NJointCartesianWaypointControllerRuntimeConfig& cfg, - RemoteGui::ValueMap const& values, std::string const& name) + + void getValue(NJointCartesianWaypointControllerRuntimeConfig& cfg, + RemoteGui::ValueMap const& values, std::string const& name) { getValue(cfg.wpCfg, values, name); getValue(cfg.forceThreshold, values, name + "_forceThreshold"); diff --git a/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.h b/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.h index f06371d4fe96ec51fcafbf80fb9a999e86f697f3..29f90e3c4c04ae26139b54a01524ba1396142191 100644 --- a/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.h +++ b/source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.h @@ -36,15 +36,7 @@ namespace armarx::RemoteGui NJointCartesianWaypointControllerRuntimeConfig getValue<NJointCartesianWaypointControllerRuntimeConfig>( ValueMap const& values, std::string const& name); -} -namespace armarx::RemoteGui::detail::_getValue -{ - template<> - struct GetValueOutputParameter <NJointCartesianWaypointControllerRuntimeConfig, void> : std::true_type - { - static void call( - NJointCartesianWaypointControllerRuntimeConfig& cfg, - RemoteGui::ValueMap const& values, std::string const& name); - }; + void getValue(NJointCartesianWaypointControllerRuntimeConfig& cfg, + RemoteGui::ValueMap const& values, std::string const& name); }