From 2570259074776d43e1061c4fe22539e9c3fa2cd8 Mon Sep 17 00:00:00 2001
From: Raphael Grimm <raphael.grimm@student.kit.edu>
Date: Wed, 6 Sep 2017 14:05:24 +0200
Subject: [PATCH] Renaming Lvl0Controllers / Lvl1Controllers to
 JointControllers / NJointControllers (fixing cmake)

---
 .../components/units/RobotUnit/CMakeLists.txt | 22 +++++++++----------
 .../RobotUnitPlugin/CMakeLists.txt            | 16 +++++++-------
 source/RobotAPI/interface/CMakeLists.txt      |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/source/RobotAPI/components/units/RobotUnit/CMakeLists.txt b/source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
index 9e9ff8947..2bbf03b24 100644
--- a/source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
+++ b/source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
@@ -34,12 +34,12 @@ set(LIB_FILES
     Units/KinematicSubUnit.cpp
     Units/PlatformSubUnit.cpp
 
-    Lvl0Controllers/Lvl0Controller.cpp
+    JointControllers/JointController.cpp
 
-    Lvl1Controllers/Lvl1Controller.cpp
-    Lvl1Controllers/Lvl1TrajectoryController.cpp
-    Lvl1Controllers/Lvl1KinematicUnitPassThroughController.cpp
-    Lvl1Controllers/Lvl1HolonomicPlatformUnitVelocityPassThroughController.cpp
+    NJointControllers/NJointController.cpp
+    NJointControllers/NJointTrajectoryController.cpp
+    NJointControllers/NJointKinematicUnitPassThroughController.cpp
+    NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.cpp
 
     Devices/SensorDevice.cpp
     Devices/ControlDevice.cpp
@@ -72,13 +72,13 @@ set(LIB_HEADERS
     Units/KinematicSubUnit.h
     Units/PlatformSubUnit.h
 
-    Lvl0Controllers/Lvl0Controller.h
+    JointControllers/JointController.h
 
-    Lvl1Controllers/Lvl1Controller.h
-    Lvl1Controllers/Lvl1Controller.hpp
-    Lvl1Controllers/Lvl1TrajectoryController.h
-    Lvl1Controllers/Lvl1KinematicUnitPassThroughController.h
-    Lvl1Controllers/Lvl1HolonomicPlatformUnitVelocityPassThroughController.h
+    NJointControllers/NJointController.h
+    NJointControllers/NJointController.hpp
+    NJointControllers/NJointTrajectoryController.h
+    NJointControllers/NJointKinematicUnitPassThroughController.h
+    NJointControllers/NJointHolonomicPlatformUnitVelocityPassThroughController.h
 
     Devices/DeviceBase.h
     Devices/SensorDevice.h
diff --git a/source/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt b/source/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt
index ab345dc21..96d572adb 100644
--- a/source/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt
+++ b/source/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt
@@ -12,9 +12,9 @@ set(SOURCES
     RobotUnitPluginGuiPlugin.cpp
     RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
     QWidgets/RobotUnitWidgetBase.cpp
-    QWidgets/Lvl1ControllerClassesWidget.cpp
+    QWidgets/NJointControllerClassesWidget.cpp
     QWidgets/ControlDevicesWidget.cpp
-    QWidgets/Lvl1ControllersWidget.cpp
+    QWidgets/NJointControllersWidget.cpp
     QWidgets/SensorDevicesWidget.cpp
 )
 
@@ -22,9 +22,9 @@ set(HEADERS
     RobotUnitPluginGuiPlugin.h
     RobotUnitPlugin/RobotUnitPluginWidgetController.h
     QWidgets/RobotUnitWidgetBase.h
-    QWidgets/Lvl1ControllerClassesWidget.h
+    QWidgets/NJointControllerClassesWidget.h
     QWidgets/ControlDevicesWidget.h
-    QWidgets/Lvl1ControllersWidget.h
+    QWidgets/NJointControllersWidget.h
     QWidgets/SensorDevicesWidget.h
     QWidgets/StyleSheets.h
 )
@@ -33,18 +33,18 @@ set(GUI_MOC_HDRS
     RobotUnitPlugin/RobotUnitPluginWidgetController.h
 
     QWidgets/RobotUnitWidgetBase.h
-    QWidgets/Lvl1ControllerClassesWidget.h
+    QWidgets/NJointControllerClassesWidget.h
     QWidgets/ControlDevicesWidget.h
-    QWidgets/Lvl1ControllersWidget.h
+    QWidgets/NJointControllersWidget.h
     QWidgets/SensorDevicesWidget.h
 )
 
 set(GUI_UIS
     RobotUnitPlugin/RobotUnitPluginWidget.ui
 
-    QWidgets/Lvl1ControllerClassesWidget.ui
+    QWidgets/NJointControllerClassesWidget.ui
     QWidgets/ControlDevicesWidget.ui
-    QWidgets/Lvl1ControllersWidget.ui
+    QWidgets/NJointControllersWidget.ui
     QWidgets/SensorDevicesWidget.ui
 )
 
diff --git a/source/RobotAPI/interface/CMakeLists.txt b/source/RobotAPI/interface/CMakeLists.txt
index 9dc31a1b8..33d31e2cd 100644
--- a/source/RobotAPI/interface/CMakeLists.txt
+++ b/source/RobotAPI/interface/CMakeLists.txt
@@ -40,8 +40,8 @@ set(SLICE_FILES
     units/GamepadUnit.ice
     units/MetaWearIMUInterface.ice
     units/MetaWearIMU.ice
-    units/RobotUnit/Lvl1Controller.ice
-    units/RobotUnit/Lvl1TrajectoryController.ice
+    units/RobotUnit/NJointController.ice
+    units/RobotUnit/NJointTrajectoryController.ice
     units/RobotUnit/RobotUnitInterface.ice
 
     components/ViewSelectionInterface.ice
-- 
GitLab