From b0fdafb8ea309a619cd5f8981395c49764e1669c Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Thu, 6 Sep 2018 13:03:45 +0200
Subject: [PATCH] Adjusted CMakeList to add resource file to studentGUI
---
pps_ws/src/d_fall_pps/CMakeLists.txt | 15 ++++++++++++---
.../GUI_Qt/studentGUI/include/MainWindow.h | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/CMakeLists.txt b/pps_ws/src/d_fall_pps/CMakeLists.txt
index 065f3562..57c8f45e 100755
--- a/pps_ws/src/d_fall_pps/CMakeLists.txt
+++ b/pps_ws/src/d_fall_pps/CMakeLists.txt
@@ -59,12 +59,18 @@ find_package(Qt5Svg REQUIRED)
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)
+# GUI -- Resource file
+set(MY_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
+
+
+
# StudentGUI -- Add src and includes
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)
-# GUI -- Resource file
-set(MY_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/CrazyFlyGUI/CrazyFlyGUI.qrc)
+# StudentGUI -- Resource file
+set(STUDENT_RESOURCE_FILE_QRC ${PROJECT_SOURCE_DIR}/GUI_Qt/studentGUI/studentgui.qrc)
+
# #set the default path for built executables to the "bin" directory
# set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
@@ -105,6 +111,9 @@ set(SRC_HDRS_QOBJECT_STUDENT_GUI
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})
+
## Uncomment this if the package has a setup.py. This macro ensures
@@ -309,7 +318,7 @@ add_executable(my_GUI ${MY_CPP_SOURCES_GUI} ${UIS_HDRS_GUI} ${SRC_MOC_HDRS_GUI}
qt5_use_modules(my_GUI Widgets)
# StudentGUI -- Add executables here
-add_executable(student_GUI ${MY_CPP_SOURCES_STUDENT_GUI} ${UIS_HDRS_STUDENT_GUI} ${SRC_MOC_HDRS_STUDENT_GUI})
+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)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
index 574a1f97..bcd5c414 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/include/MainWindow.h
@@ -217,7 +217,7 @@ private:
const float battery_voltage_empty_while_flying = 2.80; // in Volts
const float battery_voltage_empty_while_motors_off = 3.30; // in Volts
// BATTERY FULL VOLTAGES
- const float battery_voltage_full_while_flying = 3.40; // in Volts
+ const float battery_voltage_full_while_flying = 3.70; // in Volts
const float battery_voltage_full_while_motors_off = 4.20; // in Volts
ros::Publisher crazyRadioCommandPublisher;
--
GitLab