Merge branch 'master' into StatechartCodeGenerator

source/RobotAPI/applications/HeadIKUnit/HeadIKUnitApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/HeadIKUnit.h>
+#include <RobotAPI/libraries/units/HeadIKUnit.h>
 
 namespace armarx
 {

source/RobotAPI/applications/KinematicUnitObserver/KinematicUnitObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/KinematicUnitObserver.h>
+#include <RobotAPI/libraries/units/KinematicUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/KinematicUnitSimulation/KinematicUnitSimulationApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/KinematicUnitSimulation.h>
+#include <RobotAPI/libraries/units/KinematicUnitSimulation.h>
 
 namespace armarx
 {

source/RobotAPI/applications/MotionControl/MotionControlApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/motioncontrol/MotionControl.h>
+#include <RobotAPI/statecharts/motioncontrol/MotionControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/MotionControlTest/MotionControlTestApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/motioncontrol/MotionControl.h>
+#include <RobotAPI/statecharts/motioncontrol/MotionControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/MovePlatform/CMakeLists.txt

-#test case to move platform to prespecified positions
-
-armarx_component_set_name(MovePlatformApp)
-
-find_package(Eigen3 QUIET)
-
-armarx_build_if(Eigen3_FOUND "Eigen3 not available")
-
-include_directories(${Eigen3_INCLUDE_DIR})
-
-if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
-endif()
-armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
-include_directories(${Simox_INCLUDE_DIRS})
-
-set(COMPONENT_LIBS MovePlatform)
-
-set(SOURCES main.cpp
-    MovePlatformApp.h)
-
-armarx_add_component_executable("${SOURCES}")

source/RobotAPI/applications/MovePlatform/MovePlatformApp.h

-/*
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    RobotAPI::applications::MovePlatformApp
- * @author     Valerij Wittenbeck
- * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
- *             GNU General Public License
- */
-
-#ifndef _ARMARX_APPLICATION_MovePlatform_H
-#define _ARMARX_APPLICATION_MovePlatform_H
-
-
-#include <RobotAPI/statecharts/MovePlatform/MovePlatform.h>
-
-#include <Core/core/application/Application.h>
-
-namespace armarx
-{
-    class MovePlatformApp :
-        virtual public armarx::Application
-    {
-        /**
-         * @see armarx::Application::setup()
-         */
-        void setup(const ManagedIceObjectRegistryInterfacePtr& registry,
-                   Ice::PropertiesPtr properties)
-        {
-            registry->addObject( Component::create<MovePlatformStateChart>(properties) );
-        }
-    };
-}
-
-#endif

source/RobotAPI/applications/MovePlatform/main.cpp

-/*
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    RobotAPI::application::MovePlatform
- * @author     Valerij Wittenbeck
- * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
- *             GNU General Public License
- */
-
-#include "MovePlatformApp.h"
-#include <Core/core/logging/Logging.h>
-
-int main(int argc, char* argv[])
-{
-    armarx::ApplicationPtr app = armarx::Application::createInstance<armarx::MovePlatformApp>();
-    app->setName("MovePlatformApp");
-
-    return app->main(argc, argv);
-}

source/RobotAPI/applications/MovePlatformToLandmark/CMakeLists.txt

-#test case to move platform to prespecified positions
-
-armarx_component_set_name(MovePlatformToLandmarkApp)
-
-find_package(Eigen3 QUIET)
-
-armarx_build_if(Eigen3_FOUND "Eigen3 not available")
-
-include_directories(${Eigen3_INCLUDE_DIR})
-
-if (NOT Simox_FOUND)
-    find_package(Simox 2.3.0 QUIET)
-endif()
-armarx_build_if(Simox_FOUND "Simox-VirtualRobot not available")
-include_directories(${Simox_INCLUDE_DIRS})
-
-set(COMPONENT_LIBS MovePlatformToLandmark)
-
-set(SOURCES main.cpp
-    MovePlatformToLandmarkApp.h)
-
-armarx_add_component_executable("${SOURCES}")

source/RobotAPI/applications/MovePlatformToLandmark/MovePlatformToLandmarkApp.h

-/*
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    RobotAPI::applications::MovePlatformToLandmarkApp
- * @author     Valerij Wittenbeck
- * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
- *             GNU General Public License
- */
-
-#ifndef _ARMARX_APPLICATION_MovePlatformToLandmark_H
-#define _ARMARX_APPLICATION_MovePlatformToLandmark_H
-
-
-#include <RobotAPI/statecharts/MovePlatformToLandmark/MovePlatformToLandmark.h>
-
-#include <Core/core/application/Application.h>
-
-namespace armarx
-{
-    class MovePlatformToLandmarkApp :
-        virtual public armarx::Application
-    {
-        /**
-         * @see armarx::Application::setup()
-         */
-        void setup(const ManagedIceObjectRegistryInterfacePtr& registry,
-                   Ice::PropertiesPtr properties)
-        {
-            registry->addObject( Component::create<MovePlatformToLandmarkStateChart>(properties) );
-        }
-    };
-}
-
-#endif

source/RobotAPI/applications/MovePlatformToLandmark/main.cpp

-/*
- * 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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * @package    RobotAPI::application::MovePlatformToLandmark
- * @author     Valerij Wittenbeck
- * @date       2014
- * @copyright  http://www.gnu.org/licenses/gpl.txt
- *             GNU General Public License
- */
-
-#include "MovePlatformToLandmarkApp.h"
-#include <Core/core/logging/Logging.h>
-
-int main(int argc, char* argv[])
-{
-    armarx::ApplicationPtr app = armarx::Application::createInstance<armarx::MovePlatformToLandmarkApp>();
-    app->setName("MovePlatformToLandmarkApp");
-
-    return app->main(argc, argv);
-}

source/RobotAPI/applications/PlatformUnitObserver/PlatformUnitObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/PlatformUnitObserver.h>
+#include <RobotAPI/libraries/units/PlatformUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/PlatformUnitSimulation/PlatformUnitSimulationApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/PlatformUnitSimulation.h>
+#include <RobotAPI/libraries/units/PlatformUnitSimulation.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotControl/RobotControlApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/operations/RobotControl.h>
+#include <RobotAPI/statecharts/operations/RobotControl.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotControlUI/RobotControlUI.h

@@ -28,7 +28,7 @@
 #include <Core/core/Component.h>
 #include <Core/core/services/tasks/RunningTask.h>
 #include <Core/core/IceManager.h>
-#include <RobotAPI/operations/RobotControl.h>
+#include <RobotAPI/statecharts/operations/RobotControl.h>
 #include <string>
 
 namespace armarx

source/RobotAPI/applications/RobotStateComponent/RobotStateComponentApp.h

@@ -24,7 +24,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/robotstate/RobotStateComponent.h>
+#include <RobotAPI/libraries/robotstate/RobotStateComponent.h>
 
 namespace armarx
 {

source/RobotAPI/applications/RobotStateObserver/RobotStateObserverApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/robotstate/remote/RobotStateObserver.h>
+#include <RobotAPI/libraries/robotstate/remote/RobotStateObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/TCPControlUnit/TCPControlUnitApp.h

@@ -23,8 +23,8 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/TCPControlUnit.h>
-#include <RobotAPI/units/TCPControlUnitObserver.h>
+#include <RobotAPI/libraries/units/TCPControlUnit.h>
+#include <RobotAPI/libraries/units/TCPControlUnitObserver.h>
 
 namespace armarx
 {

source/RobotAPI/applications/TCPMoverUnit/TCPMoverUnitApp.h

@@ -23,7 +23,7 @@
 
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/TCPMoverUnit.h>
+#include <RobotAPI/libraries/units/TCPMoverUnit.h>
 
 namespace armarx
 {

source/RobotAPI/applications/WeissHapticSensor/WeissHapticSensorApp.h

@@ -25,10 +25,10 @@
 #define _ARMARX_APPLICATION_RobotAPI_WeissHapticSensor_H
 
 
-#include <RobotAPI/armarx-objects/WeissHapticSensorListener/WeissHapticSensorListener.h>
+#include <RobotAPI/components/WeissHapticSensorListener/WeissHapticSensorListener.h>
 
 #include <Core/core/application/Application.h>
-#include <RobotAPI/units/HapticObserver.h>
+#include <RobotAPI/libraries/units/HapticObserver.h>
 
 namespace armarx
 {