From 1181582691cc6d4886fcafb1940ca5be338d5da0 Mon Sep 17 00:00:00 2001
From: beuchatp <beuchatp@control.ee.ethz.ch>
Date: Sun, 10 Feb 2019 12:50:03 +0100
Subject: [PATCH] Changed name of my_GUI (aka. CrazyFlyGUI) to SystemConfigGUI
---
dfall_ws/src/dfall_pkg/CMakeLists.txt | 83 +++++++++----------
.../{CrazyFlyGUI.pro => SystemConfigGUI.pro} | 4 +-
.../{CrazyFlyGUI.qrc => SystemConfigGUI.qrc} | 0
.../GUI_Qt/CrazyFlyGUI/include/CFLinker.h | 2 +-
.../CrazyFlyGUI/include/mainguiwindow.h | 2 +-
....h => rosNodeThread_for_systemConfigGUI.h} | 4 +-
.../GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp | 4 +-
... => rosNodeThread_for_systemConfigGUI.cpp} | 6 +-
.../GUI_Qt/flyingAgentGUI/src/mainwindow.cpp | 3 +-
.../src/rosNodeThread_for_flyingAgentGUI.cpp | 4 +-
dfall_ws/src/dfall_pkg/launch/Agent.launch | 4 +-
.../src/dfall_pkg/launch/Coordinator.launch | 4 +-
12 files changed, 60 insertions(+), 60 deletions(-)
rename dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/{CrazyFlyGUI.pro => SystemConfigGUI.pro} (95%)
rename dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/{CrazyFlyGUI.qrc => SystemConfigGUI.qrc} (100%)
rename dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/{rosNodeThread_for_managerGUI.h => rosNodeThread_for_systemConfigGUI.h} (96%)
rename dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/{rosNodeThread_for_managerGUI.cpp => rosNodeThread_for_systemConfigGUI.cpp} (95%)
diff --git a/dfall_ws/src/dfall_pkg/CMakeLists.txt b/dfall_ws/src/dfall_pkg/CMakeLists.txt
index 9071a97a..6df6018d 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(MY_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/src)
-set(MY_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/include)
-set(MY_GUI_LIB_PATH_FORMS ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/forms)
-set(MY_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
+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)
@@ -92,18 +92,18 @@ add_definitions(-std=c++11)
# GUI -- Special Qt sources that need to be wrapped before being compiled
# they have the Qt macro QOBJECT inside, the MOC cpp file needs to be done manually
set(SRC_HDRS_QOBJECT_GUI
- ${MY_GUI_LIB_PATH_INC}/crazyFlyZoneTab.h
- ${MY_GUI_LIB_PATH_INC}/myGraphicsScene.h
- ${MY_GUI_LIB_PATH_INC}/myGraphicsView.h
- ${MY_GUI_LIB_PATH_INC}/mainguiwindow.h
- ${MY_GUI_LIB_PATH_INC}/rosNodeThread_for_managerGUI.h
- ${MY_GUI_LIB_PATH_INC}/CFLinker.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/crazyFlyZoneTab.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/myGraphicsScene.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/myGraphicsView.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/mainguiwindow.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/rosNodeThread_for_systemConfigGUI.h
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC}/CFLinker.h
)
# GUI -- wrap UI file and QOBJECT files
-qt5_wrap_ui(UIS_HDRS_GUI ${MY_GUI_LIB_PATH_FORMS}/mainguiwindow.ui)
+qt5_wrap_ui(UIS_HDRS_GUI ${SYSTEM_CONFIG_GUI_LIB_PATH_FORMS}/mainguiwindow.ui)
qt5_wrap_cpp(SRC_MOC_HDRS_GUI ${SRC_HDRS_QOBJECT_GUI})
# GUI -- wrap resource file qrc->rcc
-qt5_add_resources(MY_RESOURCE_FILE_RCC ${MY_RESOURCE_FILE_QRC})
+qt5_add_resources(SYSTEM_CONFIG_GUI_RESOURCE_FILE_RRC ${SYSTEM_CONFIG_GUI_RESOURCE_FILE_QRC})
@@ -285,7 +285,7 @@ generate_messages(
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
- INCLUDE_DIRS include ${MY_GUI_LIB_PATH_INC} # GUI -- include headers from GUI in package
+ INCLUDE_DIRS include ${SYSTEM_CONFIG_GUI_LIB_PATH_INC} # GUI -- include headers from GUI in package
INCLUDE_DIRS include ${STUDENT_GUI_LIB_PATH_INC} # StudentGUI -- include headers from GUI in package
INCLUDE_DIRS include ${FLYING_AGENT_GUI_LIB_PATH_INC} # FlyingAgentGUI -- include headers from GUI in package
LIBRARIES
@@ -301,7 +301,7 @@ catkin_package(
## Your package locations should be listed before other locations
# include_directories(include)
include_directories(
- ${MY_GUI_LIB_PATH_INC} # GUI -- include directory inside GUI folder
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_INC} # GUI -- include directory inside GUI folder
${STUDENT_GUI_LIB_PATH_INC} # StudentGUI -- include directory inside GUI folder
${FLYING_AGENT_GUI_LIB_PATH_INC} # FlyingAgentGUI -- include directory inside GUI folder
${catkin_INCLUDE_DIRS}
@@ -351,28 +351,28 @@ add_executable(ParameterService src/nodes/ParameterService.cpp)
# GUI -- Add sources here
-set(MY_CPP_SOURCES_GUI # compilation of sources
- ${MY_GUI_LIB_PATH_SRC}/mainguiwindow.cpp
- ${MY_GUI_LIB_PATH_SRC}/main.cpp
- ${MY_GUI_LIB_PATH_SRC}/cornergrabber.cpp
- ${MY_GUI_LIB_PATH_SRC}/crazyFlyZone.cpp
- ${MY_GUI_LIB_PATH_SRC}/crazyFlyZoneTab.cpp
- ${MY_GUI_LIB_PATH_SRC}/myGraphicsRectItem.cpp
- ${MY_GUI_LIB_PATH_SRC}/myGraphicsScene.cpp
- ${MY_GUI_LIB_PATH_SRC}/myGraphicsView.cpp
- ${MY_GUI_LIB_PATH_SRC}/tablePiece.cpp
- ${MY_GUI_LIB_PATH_SRC}/marker.cpp
- ${MY_GUI_LIB_PATH_SRC}/rosNodeThread_for_managerGUI.cpp
- ${MY_GUI_LIB_PATH_SRC}/crazyFly.cpp
- ${MY_GUI_LIB_PATH_SRC}/CFLinker.cpp
- ${MY_GUI_LIB_PATH_SRC}/channelLUT.cpp
- ${MY_GUI_LIB_PATH_SRC}/centerMarker.cpp
+set(SYSTEM_CONFIG_GUI_CPP_SOURCES # compilation of sources
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/mainguiwindow.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/main.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/cornergrabber.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/crazyFlyZone.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/crazyFlyZoneTab.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/myGraphicsRectItem.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/myGraphicsScene.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/myGraphicsView.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/tablePiece.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/marker.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/rosNodeThread_for_systemConfigGUI.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/crazyFly.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/CFLinker.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/channelLUT.cpp
+ ${SYSTEM_CONFIG_GUI_LIB_PATH_SRC}/centerMarker.cpp
)
# StudentGUI -- Add sources here
-set(MY_CPP_SOURCES_STUDENT_GUI # compilation of sources
+set(STUDENT_GUI_CPP_SOURCES # compilation of sources
${STUDENT_GUI_LIB_PATH_SRC}/MainWindow.cpp
${STUDENT_GUI_LIB_PATH_SRC}/main.cpp
${STUDENT_GUI_LIB_PATH_SRC}/rosNodeThread_for_studentGUI.cpp
@@ -381,7 +381,7 @@ set(MY_CPP_SOURCES_STUDENT_GUI # compilation of sources
# FLYING AGENT GUI -- Add sources here
-set(MY_CPP_SOURCES_FLYING_AGENT_GUI # compilation of sources
+set(FLYING_AGENT_GUI_CPP_SOURCES # compilation of sources
${FLYING_AGENT_GUI_LIB_PATH_SRC}/mainwindow.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/main.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/rosNodeThread_for_flyingAgentGUI.cpp
@@ -401,18 +401,18 @@ set(MY_CPP_SOURCES_FLYING_AGENT_GUI # compilation of sources
# GUI -- Add executables here
-add_executable(my_GUI ${MY_CPP_SOURCES_GUI} ${UIS_HDRS_GUI} ${SRC_MOC_HDRS_GUI} ${MY_RESOURCE_FILE_RCC})
-qt5_use_modules(my_GUI Widgets)
+add_executable(systemConfigGUI ${SYSTEM_CONFIG_GUI_CPP_SOURCES} ${UIS_HDRS_GUI} ${SRC_MOC_HDRS_GUI} ${SYSTEM_CONFIG_GUI_RESOURCE_FILE_RRC})
+qt5_use_modules(systemConfigGUI Widgets)
# StudentGUI -- Add executables here
-add_executable(student_GUI ${MY_CPP_SOURCES_STUDENT_GUI} ${UIS_HDRS_STUDENT_GUI} ${SRC_MOC_HDRS_STUDENT_GUI} ${STUDENT_RESOURCE_FILE_RCC})
+add_executable(student_GUI ${STUDENT_GUI_CPP_SOURCES} ${UIS_HDRS_STUDENT_GUI} ${SRC_MOC_HDRS_STUDENT_GUI} ${STUDENT_RESOURCE_FILE_RCC})
qt5_use_modules(student_GUI Widgets)
# FLYING AGENT GUI -- Add executables here
-add_executable(flyingAgentGUI ${MY_CPP_SOURCES_FLYING_AGENT_GUI} ${UIS_HDRS_FLYING_AGENT_GUI} ${SRC_MOC_HDRS_FLYING_AGENT_GUI} ${FLYING_AGENT_GUI_RESOURCE_FILE_RCC})
+add_executable(flyingAgentGUI ${FLYING_AGENT_GUI_CPP_SOURCES} ${UIS_HDRS_FLYING_AGENT_GUI} ${SRC_MOC_HDRS_FLYING_AGENT_GUI} ${FLYING_AGENT_GUI_RESOURCE_FILE_RCC})
qt5_use_modules(flyingAgentGUI Widgets)
@@ -437,7 +437,7 @@ add_dependencies(ParameterService dfall_pkg_generate_messages_cpp ${cat
# GUI-- dependencies
-add_dependencies(my_GUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
+add_dependencies(systemConfigGUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
@@ -493,12 +493,9 @@ target_link_libraries(ParameterService ${catkin_LIBRARIES})
# GUI -- link libraries
-target_link_libraries(my_GUI Qt5::Widgets) # GUI -- let my_GUI have acesss to Qt stuff
-target_link_libraries(my_GUI Qt5::Svg)
-
-# target_link_libraries(my_library Qt5::Widgets) # GUI -- let my_library have access to Qt stuff
-# target_link_libraries(my_GUI my_library)
-target_link_libraries(my_GUI ${catkin_LIBRARIES})
+target_link_libraries(systemConfigGUI Qt5::Widgets) # GUI -- let systemConfigGUI have acesss to Qt stuff
+target_link_libraries(systemConfigGUI Qt5::Svg)
+target_link_libraries(systemConfigGUI ${catkin_LIBRARIES})
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.pro
similarity index 95%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.pro
index 0175414f..f338a455 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.pro
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.pro
@@ -8,13 +8,13 @@ QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-TARGET = CrazyFlyGUI
+TARGET = SystemConfigGUI
TEMPLATE = app
INCLUDEPATH += $$PWD/include
CONFIG += c++11
-RESOURCES = CrazyFlyGUI.qrc
+RESOURCES = SystemConfigGUI.qrc
QT+= svg
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.qrc
similarity index 100%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/SystemConfigGUI.qrc
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
index a0a9f568..b0eb2064 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/CFLinker.h
@@ -38,7 +38,7 @@
#include "crazyFlyZone.h"
#include "ui_mainguiwindow.h"
-#include "rosNodeThread_for_managerGUI.h"
+#include "rosNodeThread_for_systemConfigGUI.h"
#include <QObject>
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
index e9fa1320..abe9d659 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/mainguiwindow.h
@@ -41,7 +41,7 @@
#ifdef CATKIN_MAKE
-#include "rosNodeThread_for_managerGUI.h"
+#include "rosNodeThread_for_systemConfigGUI.h"
// Include the standard message types
#include "std_msgs/Int32.h"
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_systemConfigGUI.h
similarity index 96%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_systemConfigGUI.h
index 65c516e2..1a4f037c 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_managerGUI.h
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/include/rosNodeThread_for_systemConfigGUI.h
@@ -30,8 +30,8 @@
// ----------------------------------------------------------------------------------
-#ifndef ___ROSNODETHREAD_FOR_MANAGERGUI_H___
-#define ___ROSNODETHREAD_FOR_MANAGERGUI_H___
+#ifndef ___ROSNODETHREAD_FOR_SYSTEMCONFIGGUI_H___
+#define ___ROSNODETHREAD_FOR_SYSTEMCONFIGGUI_H___
#include <QtCore>
#include <QThread>
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
index 3b495f9f..b8615d17 100755
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/mainguiwindow.cpp
@@ -73,7 +73,7 @@ MainGUIWindow::MainGUIWindow(int argc, char **argv, QWidget *parent) :
ui(new Ui::MainGUIWindow)
{
#ifdef CATKIN_MAKE
- _rosNodeThread = new rosNodeThread(argc, argv, "my_GUI");
+ _rosNodeThread = new rosNodeThread(argc, argv, "SystemConfigGUI");
#endif
ui->setupUi(this);
_init();
@@ -274,7 +274,7 @@ void MainGUIWindow::_init()
ros_namespace = ros::this_node::getNamespace();
- ros::NodeHandle nodeHandle("~");
+ //ros::NodeHandle nodeHandle("~");
//DBChangedPublisher = nodeHandle.advertise<std_msgs::Int32>("DBChanged", 1);
// CREATE A NODE HANDLE TO THE ROOT OF THE D-FaLL SYSTEM
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_systemConfigGUI.cpp
similarity index 95%
rename from dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp
rename to dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_systemConfigGUI.cpp
index bbb3f6c1..847e8616 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_managerGUI.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/CrazyFlyGUI/src/rosNodeThread_for_systemConfigGUI.cpp
@@ -30,7 +30,7 @@
// ----------------------------------------------------------------------------------
-#include "rosNodeThread_for_managerGUI.h"
+#include "rosNodeThread_for_systemConfigGUI.h"
#include "dfall_pkg/CMRead.h"
#include "dfall_pkg/CMUpdate.h"
@@ -63,7 +63,9 @@ bool rosNodeThread::init()
this->moveToThread(m_pThread); // QObject method
connect(m_pThread, SIGNAL(started()), this, SLOT(run()));
- ros::init(m_Init_argc, m_pInit_argv, m_node_name); // my_GUI is the name of this node
+ ros::init(m_Init_argc, m_pInit_argv, m_node_name);
+ // Note that the variable "m_node_name" should be the
+ // string "SystemConfigGUI" in this case
if (!ros::master::check())
{
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
index 2ca4c562..45c3fee7 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
@@ -37,8 +37,7 @@ MainWindow::MainWindow(int argc, char **argv, QWidget *parent) :
ui(new Ui::MainWindow)
{
#ifdef CATKIN_MAKE
- //ROS_INFO("[flyingAgentGUI] Debug Point 5");
- m_rosNodeThread = new rosNodeThread(argc, argv, "flyingAgentGUI");
+ m_rosNodeThread = new rosNodeThread(argc, argv, "FlyingAgentGUI");
#endif
#ifdef CATKIN_MAKE
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
index 5072e14e..b9704007 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/rosNodeThread_for_flyingAgentGUI.cpp
@@ -65,7 +65,9 @@ bool rosNodeThread::init()
this->moveToThread(m_pThread); // QObject method
connect(m_pThread, SIGNAL(started()), this, SLOT(run()));
- ros::init(m_Init_argc, m_pInit_argv, m_node_name); // flyingAgentGUI is the name of this node
+ ros::init(m_Init_argc, m_pInit_argv, m_node_name);
+ // Note that the variable "m_node_name" should be the
+ // string "FlyingAgentGUI" in this case
if (!ros::master::check())
{
diff --git a/dfall_ws/src/dfall_pkg/launch/Agent.launch b/dfall_ws/src/dfall_pkg/launch/Agent.launch
index 0eca8749..33b24834 100755
--- a/dfall_ws/src/dfall_pkg/launch/Agent.launch
+++ b/dfall_ws/src/dfall_pkg/launch/Agent.launch
@@ -156,9 +156,9 @@
<group if="$(arg withGUI)">
<node
pkg = "dfall_pkg"
- name = "flyingAgentGUI"
+ name = "FlyingAgentGUI"
output = "screen"
- type = "flyingAgentGUI"
+ type = "FlyingAgentGUI"
>
<param name="type" type="str" value="agent" />
<param name="agentID" value="$(arg agentID)" />
diff --git a/dfall_ws/src/dfall_pkg/launch/Coordinator.launch b/dfall_ws/src/dfall_pkg/launch/Coordinator.launch
index 61dacd38..9d10deaf 100755
--- a/dfall_ws/src/dfall_pkg/launch/Coordinator.launch
+++ b/dfall_ws/src/dfall_pkg/launch/Coordinator.launch
@@ -18,9 +18,9 @@
<group if="$(arg withGUI)">
<node
pkg="dfall_pkg"
- name="flyingAgentGUI"
+ name="FlyingAgentGUI"
output="screen"
- type="flyingAgentGUI"
+ type="FlyingAgentGUI"
>
<param name="type" type="str" value="coordinator" />
<param name="coordID" value="$(arg coordID)" />
--
GitLab