Skip to content

GitLab

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit eee8ea49 authored by beuchatp's avatar beuchatp
Browse files

Merge branch 'add_battery_monitor_node' into 'master' 

Completed redevelopment of the Flying Agent Client and GUI, and the Default Controller

See merge request D-FaLL/PandS-System/D-FaLL-System!11
parents b113c913 fbade28c
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ eee8ea49
pps_ws/build/
pps_ws/devel/
dfall_ws/build/
dfall_ws/devel/
pps_ws/src/d_fall_pps/lib/vicon/
pps_ws/src/d_fall_pps/include/DataStreamClient.h
dfall_ws/src/dfall_pkg/lib/vicon/
dfall_ws/src/dfall_pkg/include/DataStreamClient.h
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/*.pro.user
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/*.pro.user
pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/*.pro.user.*
# Qt Project files with user preferences
*.pro.user
*.pro.user.*
*.pyc
*.orig
......
pps_ws/src/d_fall_pps/CMakeLists.txt → dfall_ws/src/dfall_pkg/CMakeLists.txt
View file @ eee8ea49
cmake_minimum_required(VERSION 3.0)
project(d_fall_pps)
project(dfall_pkg)
## Add support for C++11, supported in ROS Kinetic and newer
# add_definitions(-std=c++11)
......@@ -57,16 +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_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
# StudentGUI -- Add src, includes, and resources
set(STUDENT_GUI_LIB_PATH_SRC ${PROJECT_SOURCE_DIR}/GUI_Qt/studentGUI/src)
set(STUDENT_GUI_LIB_PATH_INC ${PROJECT_SOURCE_DIR}/GUI_Qt/studentGUI/include)
set(STUDENT_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/studentGUI/studentgui.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)
......@@ -91,31 +85,19 @@ 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_SRC}/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})
# StudentGUI -- Special Qt sources that need to be wrapped before being compiled
set(SRC_HDRS_QOBJECT_STUDENT_GUI
${STUDENT_GUI_LIB_PATH_INC}/MainWindow.h
${STUDENT_GUI_LIB_PATH_INC}/rosNodeThread_for_studentGUI.h
)
# StudentGUI -- wrap UI file and QOBJECT files
qt5_wrap_ui(UIS_HDRS_STUDENT_GUI ${STUDENT_GUI_LIB_PATH_SRC}/MainWindow.ui)
qt5_wrap_cpp(SRC_MOC_HDRS_STUDENT_GUI ${SRC_HDRS_QOBJECT_STUDENT_GUI})
# GUI -- wrap resource file qrc->rcc
qt5_add_resources(STUDENT_RESOURCE_FILE_RCC ${STUDENT_RESOURCE_FILE_QRC})
......@@ -135,7 +117,9 @@ set(SRC_HDRS_QOBJECT_FLYING_AGENT_GUI
${FLYING_AGENT_GUI_LIB_PATH_INC}/rosNodeThread_for_flyingAgentGUI.h
${FLYING_AGENT_GUI_LIB_PATH_INC}/safecontrollertab.h
${FLYING_AGENT_GUI_LIB_PATH_INC}/studentcontrollertab.h
${FLYING_AGENT_GUI_LIB_PATH_INC}/templatecontrollertab.h
${FLYING_AGENT_GUI_LIB_PATH_INC}/topbanner.h
${FLYING_AGENT_GUI_LIB_PATH_INC}/tuningcontrollertab.h
)
# Flying Agent GUI -- wrap UI file and QOBJECT files
qt5_wrap_ui(UIS_HDRS_FLYING_AGENT_GUI
......@@ -149,7 +133,9 @@ qt5_wrap_ui(UIS_HDRS_FLYING_AGENT_GUI
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/pickercontrollertab.ui
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/safecontrollertab.ui
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/studentcontrollertab.ui
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/templatecontrollertab.ui
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/topbanner.ui
${FLYING_AGENT_GUI_LIB_PATH_FORMS}/tuningcontrollertab.ui
)
qt5_wrap_cpp(SRC_MOC_HDRS_FLYING_AGENT_GUI ${SRC_HDRS_QOBJECT_FLYING_AGENT_GUI})
# Flying Agent GUI -- wrap resource file qrc->rcc
......@@ -205,7 +191,13 @@ add_message_files(
SetpointV2.msg
CrazyflieEntry.msg
CrazyflieDB.msg
#----------------------------------------------------------------------
#------------------------
IntWithHeader.msg
FloatWithHeader.msg
StringWithHeader.msg
SetpointWithHeader.msg
CustomButtonWithHeader.msg
#------------------------
DebugMsg.msg
CustomButton.msg
ViconSubscribeObjectName.msg
......@@ -219,12 +211,14 @@ add_message_files(
# )
add_service_files(
FILES
LoadYamlFiles.srv
IntIntService.srv
Controller.srv
CMRead.srv
CMQuery.srv
CMUpdate.srv
CMCommand.srv
LoadYamlFromFilename.srv
GetSetpointService.srv
)
## Generate actions in the 'action' folder
......@@ -274,9 +268,8 @@ 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 ${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
INCLUDE_DIRS include ${SYSTEM_CONFIG_GUI_LIB_PATH_INC} # SystemConfigGUI -- include headers from GUI in package
INCLUDE_DIRS include ${FLYING_AGENT_GUI_LIB_PATH_INC} # FlyingAgentGUI -- include headers from GUI in package
LIBRARIES
CATKIN_DEPENDS roscpp rospy std_msgs rosbag roslib
DEPENDS
......@@ -290,9 +283,8 @@ 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
${STUDENT_GUI_LIB_PATH_INC} # StudentGUI -- include directory inside GUI folder
${FLYING_AGENT_GUI_LIB_PATH_INC} # FlyingAgentGUI -- include directory inside GUI folder
${SYSTEM_CONFIG_GUI_LIB_PATH_INC} # SystemConfigGUI -- include directory inside GUI folder
${FLYING_AGENT_GUI_LIB_PATH_INC} # FlyingAgentGUI -- include directory inside GUI folder
${catkin_INCLUDE_DIRS}
include
include/nodes
......@@ -311,57 +303,60 @@ include_directories(
## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/d_fall_pps_node.cpp)
# add_executable(${PROJECT_NAME}_node src/dfall_pkg_node.cpp)
if(VICON_LIBRARY)
add_executable(ViconDataPublisher src/nodes/ViconDataPublisher.cpp)
endif()
add_executable(PPSClient src/nodes/PPSClient.cpp)
add_executable(SafeControllerService src/nodes/SafeControllerService.cpp)
add_executable(DemoControllerService src/nodes/DemoControllerService.cpp)
add_executable(StudentControllerService src/nodes/StudentControllerService.cpp)
add_executable(MpcControllerService src/nodes/MpcControllerService.cpp)
add_executable(RemoteControllerService src/nodes/RemoteControllerService.cpp)
add_executable(TuningControllerService src/nodes/TuningControllerService.cpp)
add_executable(PickerControllerService src/nodes/PickerControllerService.cpp)
add_executable(CentralManagerService src/nodes/CentralManagerService.cpp src/CrazyflieIO.cpp)
add_executable(ParameterService src/nodes/ParameterService.cpp)
add_executable(FlyingAgentClient src/nodes/FlyingAgentClient.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(BatteryMonitor src/nodes/BatteryMonitor.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(DefaultControllerService src/nodes/DefaultControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(SafeControllerService src/nodes/SafeControllerService.cpp)
add_executable(DemoControllerService src/nodes/DemoControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(StudentControllerService src/nodes/StudentControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(MpcControllerService src/nodes/MpcControllerService.cpp)
add_executable(RemoteControllerService src/nodes/RemoteControllerService.cpp)
add_executable(TuningControllerService src/nodes/TuningControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(PickerControllerService src/nodes/PickerControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(TemplateControllerService src/nodes/TemplateControllerService.cpp
src/classes/GetParamtersAndNamespaces.cpp)
add_executable(CentralManagerService src/nodes/CentralManagerService.cpp src/CrazyflieIO.cpp)
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
${STUDENT_GUI_LIB_PATH_SRC}/MainWindow.cpp
${STUDENT_GUI_LIB_PATH_SRC}/main.cpp
${STUDENT_GUI_LIB_PATH_SRC}/rosNodeThread_for_studentGUI.cpp
)
# 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
......@@ -374,57 +369,52 @@ set(MY_CPP_SOURCES_FLYING_AGENT_GUI # compilation of sources
${FLYING_AGENT_GUI_LIB_PATH_SRC}/pickercontrollertab.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/safecontrollertab.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/studentcontrollertab.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/templatecontrollertab.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/topbanner.cpp
${FLYING_AGENT_GUI_LIB_PATH_SRC}/tuningcontrollertab.cpp
)
# 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})
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})
qt5_use_modules(flyingAgentGUI Widgets)
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)
if(VICON_LIBRARY)
add_dependencies(ViconDataPublisher d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ViconDataPublisher dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
endif()
add_dependencies(PPSClient d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(SafeControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DemoControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(StudentControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(MpcControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(RemoteControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(TuningControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(PickerControllerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(CentralManagerService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ParameterService d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(FlyingAgentClient dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(BatteryMonitor dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DefaultControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(SafeControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(DemoControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(StudentControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(MpcControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(RemoteControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(TuningControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(PickerControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(TemplateControllerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(CentralManagerService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(ParameterService dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# GUI-- dependencies
add_dependencies(my_GUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# StudentGUI-- dependencies
add_dependencies(student_GUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(SystemConfigGUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
# FLYING AGENT GUI-- dependencies
add_dependencies(flyingAgentGUI d_fall_pps_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
add_dependencies(FlyingAgentGUI dfall_pkg_generate_messages_cpp ${catkin_EXPORTED_TARGETS})
......@@ -450,42 +440,36 @@ if(VICON_LIBRARY)
target_link_libraries(ViconDataPublisher ${VICON_LIBRARY})
endif()
target_link_libraries(PPSClient ${catkin_LIBRARIES})
target_link_libraries(SafeControllerService ${catkin_LIBRARIES})
target_link_libraries(DemoControllerService ${catkin_LIBRARIES})
target_link_libraries(StudentControllerService ${catkin_LIBRARIES})
target_link_libraries(FlyingAgentClient ${catkin_LIBRARIES})
target_link_libraries(BatteryMonitor ${catkin_LIBRARIES})
target_link_libraries(DefaultControllerService ${catkin_LIBRARIES})
target_link_libraries(SafeControllerService ${catkin_LIBRARIES})
target_link_libraries(DemoControllerService ${catkin_LIBRARIES})
target_link_libraries(StudentControllerService ${catkin_LIBRARIES})
if(Eigen3_FOUND)
target_link_libraries(MpcControllerService ${catkin_LIBRARIES} Eigen3::Eigen)
else()
target_link_libraries(MpcControllerService ${catkin_LIBRARIES})
endif()
target_link_libraries(RemoteControllerService ${catkin_LIBRARIES})
target_link_libraries(TuningControllerService ${catkin_LIBRARIES})
target_link_libraries(PickerControllerService ${catkin_LIBRARIES})
target_link_libraries(CentralManagerService ${catkin_LIBRARIES})
target_link_libraries(ParameterService ${catkin_LIBRARIES})
target_link_libraries(RemoteControllerService ${catkin_LIBRARIES})
target_link_libraries(TuningControllerService ${catkin_LIBRARIES})
target_link_libraries(PickerControllerService ${catkin_LIBRARIES})
target_link_libraries(TemplateControllerService ${catkin_LIBRARIES})
target_link_libraries(CentralManagerService ${catkin_LIBRARIES})
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})
# StudentGUI -- link libraries
target_link_libraries(student_GUI Qt5::Widgets) # GUI -- let student_GUI have acesss to Qt stuff
target_link_libraries(student_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})
# Flying Agent GUI -- link libraries
target_link_libraries(flyingAgentGUI Qt5::Widgets) # GUI -- let flyingAgentGUI have acesss to Qt stuff
target_link_libraries(flyingAgentGUI ${catkin_LIBRARIES})
target_link_libraries(FlyingAgentGUI Qt5::Widgets) # GUI -- let FlyingAgentGUI have acesss to Qt stuff
target_link_libraries(FlyingAgentGUI ${catkin_LIBRARIES})
......@@ -529,7 +513,7 @@ target_link_libraries(flyingAgentGUI ${catkin_LIBRARIES})
#############
## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_d_fall_pps.cpp)
# catkin_add_gtest(${PROJECT_NAME}-test test/test_dfall_pkg.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()
......
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro → dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro
View file @ eee8ea49
......@@ -27,7 +27,10 @@ SOURCES += src/main.cpp\
src/coordinatorrow.cpp \
src/studentcontrollertab.cpp \
src/defaultcontrollertab.cpp \
src/pickercontrollertab.cpp
src/pickercontrollertab.cpp \
src/templatecontrollertab.cpp \
src/tuningcontrollertab.cpp \
HEADERS += include/mainwindow.h \
include/topbanner.h \
......@@ -39,7 +42,12 @@ HEADERS += include/mainwindow.h \
include/coordinatorrow.h \
include/studentcontrollertab.h \
include/defaultcontrollertab.h \
include/pickercontrollertab.h
include/pickercontrollertab.h \
include/templatecontrollertab.h \
include/tuningcontrollertab.h \
include/Constants_for_Qt_compile.h \
FORMS += forms/mainwindow.ui \
forms/topbanner.ui \
......@@ -51,7 +59,10 @@ FORMS += forms/mainwindow.ui \
forms/coordinatorrow.ui \
forms/studentcontrollertab.ui \
forms/defaultcontrollertab.ui \
forms/pickercontrollertab.ui
forms/pickercontrollertab.ui \
forms/templatecontrollertab.ui \
forms/tuningcontrollertab.ui \
RESOURCES += \
flyingagentgui.qrc
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc → dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingagentgui.qrc
View file @ eee8ea49
......@@ -6,14 +6,17 @@
<file>images/battery_80.png</file>
<file>images/battery_empty.png</file>
<file>images/battery_full.png</file>
<file>images/battery_unknown.png</file>
<file>images/battery_unavailable.png</file>
<file>images/rf_connected.png</file>
<file>images/rf_connecting.png</file>
<file>images/rf_disconnected.png</file>
<file>images/battery_unknown.png</file>
<file>images/flying_state_disabling.png</file>
<file>images/flying_state_enabling.png</file>
<file>images/flying_state_flying.png</file>
<file>images/flying_state_off.png</file>
<file>images/flying_state_unknown.png</file>
<file>images/flying_state_unavailable.png</file>
<file>images/emergency_stop.png</file>
</qresource>
</RCC>
</RCC>
\ No newline at end of file
pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui → dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
View file @ eee8ea49
......@@ -22,19 +22,19 @@
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>6</number>
<number>12</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<number>6</number>
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="rf_disconnect_button">
......@@ -47,13 +47,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>750</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="text">
......@@ -71,8 +71,8 @@
</property>
<property name="minimumSize">
<size>
<width>95</width>
<height>70</height>
<width>72</width>
<height>55</height>
</size>
</property>
<property name="maximumSize">
......@@ -97,13 +97,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>750</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="text">
......@@ -113,22 +113,25 @@
</item>
<item>
<widget class="QLineEdit" name="battery_voltage_lineEdit">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>180</width>
<height>70</height>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="font">
......@@ -144,6 +147,9 @@
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
......@@ -156,8 +162,8 @@
</property>
<property name="minimumSize">
<size>
<width>50</width>
<height>70</height>
<width>38</width>
<height>55</height>
</size>
</property>
<property name="maximumSize">
......@@ -172,7 +178,7 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="take_off_button">
<widget class="QPushButton" name="enable_flying_button">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -182,13 +188,13 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>750</width>
<height>70</height>
<height>50</height>
</size>
</property>
<property name="text">
......@@ -197,7 +203,7 @@
</widget>
</item>
<item>
<widget class="QPushButton" name="land_button">
<widget class="QPushButton" name="disa