From 2b5e9da29f45cce688b02ae54cd66fdc13136b0b Mon Sep 17 00:00:00 2001
From: beuchatp <beuchatp@control.ee.ethz.ch>
Date: Sun, 10 Feb 2019 12:59:56 +0100
Subject: [PATCH] Changed file names for the System Config GUI
---
dfall_ws/src/dfall_pkg/CMakeLists.txt | 8 ++++----
.../{SystemConfigGUI.pro => systemConfigGUI.pro} | 4 ++--
.../{SystemConfigGUI.qrc => systemconfiggui.qrc} | 0
dfall_ws/src/dfall_pkg/launch/Teacher.launch | 4 ++--
dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp | 3 ---
5 files changed, 8 insertions(+), 11 deletions(-)
rename dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/{SystemConfigGUI.pro => systemConfigGUI.pro} (95%)
rename dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/{SystemConfigGUI.qrc => systemconfiggui.qrc} (100%)
diff --git a/dfall_ws/src/dfall_pkg/CMakeLists.txt b/dfall_ws/src/dfall_pkg/CMakeLists.txt
index 6df6018d..dcbc0a05 100755
--- a/dfall_ws/src/dfall_pkg/CMakeLists.txt
+++ b/dfall_ws/src/dfall_pkg/CMakeLists.txt
@@ -57,10 +57,10 @@ find_package(Qt5Svg REQUIRED)
# GUI -- Add src, includes, and resources
-set(SYSTEM_CONFIG_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/src)
-set(SYSTEM_CONFIG_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/include)
-set(SYSTEM_CONFIG_GUI_LIB_PATH_FORMS ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/forms)
-set(SYSTEM_CONFIG_GUI_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/src)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/include)
+set(SYSTEM_CONFIG_GUI_LIB_PATH_FORMS ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/forms)
+set(SYSTEM_CONFIG_GUI_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/systemConfigGUI/systemconfiggui.qrc)
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
similarity index 95%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
index f338a455..4c480d64 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.pro
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemConfigGUI.pro
@@ -8,13 +8,13 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-TARGET = SystemConfigGUI
+TARGET = systemConfigGUI
TEMPLATE = app
INCLUDEPATH += $$PWD/include
CONFIG += c++11
-RESOURCES = SystemConfigGUI.qrc
+RESOURCES = systemconfiggui.qrc
QT+= svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemconfiggui.qrc
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/SystemConfigGUI.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/systemConfigGUI/systemconfiggui.qrc
diff --git a/dfall_ws/src/dfall_pkg/launch/Teacher.launch b/dfall_ws/src/dfall_pkg/launch/Teacher.launch
index b093995b..a9235436 100755
--- a/dfall_ws/src/dfall_pkg/launch/Teacher.launch
+++ b/dfall_ws/src/dfall_pkg/launch/Teacher.launch
@@ -22,9 +22,9 @@
<!-- TEACHER GUI -->
<node
pkg="dfall_pkg"
- name="my_GUI"
+ name="SystemConfigGUI"
output="screen"
- type="my_GUI"
+ type="SystemConfigGUI"
>
</node>
diff --git a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
index 72859686..eadb4743 100755
--- a/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
+++ b/dfall_ws/src/dfall_pkg/src/nodes/FlyingAgentClient.cpp
@@ -1380,9 +1380,6 @@ int main(int argc, char* argv[])
- // Subscriber for "commandAllAgents" commands that are sent from the coordinator node
- //ros::Subscriber commandAllAgentsSubscriber = namespaceNodeHandle.subscribe("/my_GUI/commandAllAgents", 1, commandAllAgentsCallback);
-
// crazyradio status. Connected, connecting or disconnected
ros::Subscriber crazyRadioStatusSubscriber = namespaceNodeHandle.subscribe("CrazyRadio/CrazyRadioStatus", 1, crazyRadioStatusCallback);
--
GitLab