Merge branch 'master' of https://i61wiki.itec.uka.de/git/robotcomponents

source/RobotComponents/gui-plugins/RobotIKPlugin/RobotIKGuiPlugin.h

@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -17,7 +16,7 @@
 * @package    ArmarX::
 * @author     Philipp Schmidt
 * @date       2015
-* @license    http://www.gnu.org/licenses/gpl.txt
+* @license    http://www.gnu.org/licenses/gpl-2.0.txt
 *             GNU General Public License
 
 */
@@ -66,9 +65,21 @@ namespace armarx
 
     /**
      * \class RobotIKWidget
-     * \ingroup RobotAPI-ArmarXGuiPlugins ArmarXGuiPlugins
-     * \brief Widget for IK computation.
+     * \page RobotComponents-GuiPlugins-RobotIK "The RobotIK Gui Plugin"
+     *
+     * \brief The RobotIK Gui Plugin can be used for IK computation.
+     *
+     * This gui plugin can be used for Cartesian control of a robot (arm). It connects to the KinemticUnit of the robot
+     * in order to execute the computed configurations via position control.
+     * Via the plugin the kinematic chain of the robot can be specified allowing to move different end effectors with varying subsets of the robot's joints.
+     *
+     *
+     * \image html RobotIKGui_small.png "The RobotIK Gui Plugin is used to move the right end effector of Armar-III."
+     *
+     *
      */
+    //     * \ingroup RobotAPI-ArmarXGuiPlugins ArmarXGuiPlugins
+
     class RobotIKWidgetController : public ArmarXComponentWidgetController
     {
         Q_OBJECT

source/RobotComponents/interface/components/DMPComponentBase.ice

@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.

source/RobotComponents/interface/components/PathPlanner.ice

@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.

source/RobotComponents/interface/components/ViewSelectionInterface.ice

@@ -2,14 +2,13 @@
 * This file is part of ArmarX.
 *
 * ArmarX is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as
-* published by the Free Software Foundation; either version 2 of
-* the License, or (at your option) any later version.
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
 *
 * ArmarX is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU Lesser General Public License for more details.
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.