diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro index c7e2f5acc9a9aa6b09bdd991b9fc73faa74fea19..78fdb9b5004a386a2fefded7f36bc29e28901540 100644 --- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro +++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/flyingAgentGUI.pro @@ -12,6 +12,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += charts +#greaterThan(QT_MAJOR_VERSION, 4): QT += multimedia + TARGET = flyingAgentGUI TEMPLATE = app diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h index 41af9a3b5221b6450788833d1639be8a3ac39433..772a6807c6704ded815094573b0a8c6720ddb714 100644 --- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h +++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/include/controllertabs.h @@ -40,6 +40,7 @@ #include <QWidget> #include <QMutex> #include <QVector> +//#include <QSoundEffect> #ifdef CATKIN_MAKE #include <ros/ros.h> @@ -141,6 +142,9 @@ private: QColor m_tab_text_colour_normal; QColor m_tab_text_colour_highlight; + // Sound effect for when the controller changes while flying + //QSoundEffect m_soundEffect_controllerChanged; + #ifdef CATKIN_MAKE // --------------------------------------------------- // diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp index 2df07eab75409198fadb8b416ea1e0a4539bde84..617745e2fd431cbefe88d166f5d35fc2932f99f0 100644 --- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp +++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp @@ -48,6 +48,13 @@ ControllerTabs::ControllerTabs(QWidget *parent) : m_tab_text_colour_normal = Qt::black; m_tab_text_colour_highlight = QColor(0,200,0); + // Initialise the sound effect for when the controller changes while flying + //QSoundEffect m_soundEffect_controllerChanged; + //m_soundEffect_controllerChanged.setSource(QUrl::fromLocalFile("engine.wav")); + //m_soundEffect_controllerChanged.setLoopCount(1); + //m_soundEffect_controllerChanged.setVolume(0.25f); + //m_soundEffect_controllerChanged.play(); + // Initialise the object name as blank m_object_name_for_emitting_pose_data = ""; diff --git a/install/dfall_install_ros_kinetic_ubuntu16.sh b/install/dfall_install_ros_kinetic_ubuntu16.sh index ecc29b27d6d6c3eb171583dc233414b231105eeb..ae1f9471b7c8a966a6d3d30d81c54a404a943301 100755 --- a/install/dfall_install_ros_kinetic_ubuntu16.sh +++ b/install/dfall_install_ros_kinetic_ubuntu16.sh @@ -88,6 +88,13 @@ sudo apt -y install qt5-default # Install the development version of the Qt5svg library sudo apt -y install libqt5svg5-dev +# Install the charting library +sudo apt install libqt5charts5-dev + +# Install the multimedia library (used for sound effects) +sudo apt install libqt5multimedia5 +sudo apt install qtmultimedia5-dev + # Install the "Qt Creator" IDE # > NOTE: this is not necessary to compile and run the dfall ROS package, # but it is required to edit the GUIs diff --git a/install/dfall_install_ros_melodic_ubuntu18.sh b/install/dfall_install_ros_melodic_ubuntu18.sh index abcfc1df324d9a27f7d4a1f88f735e281abf5f65..982da3cea59976ae1583a88d65ecacf873d866d7 100755 --- a/install/dfall_install_ros_melodic_ubuntu18.sh +++ b/install/dfall_install_ros_melodic_ubuntu18.sh @@ -88,6 +88,13 @@ sudo apt -y install qt5-default # Install the development version of the Qt5svg library sudo apt -y install libqt5svg5-dev +# Install the charting library +sudo apt install libqt5charts5-dev + +# Install the multimedia library (used for sound effects) +sudo apt install libqt5multimedia5 +sudo apt install qtmultimedia5-dev + # Install the "Qt Creator" IDE # > NOTE: this is not necessary to compile and run the dfall ROS package, # but it is required to edit the GUIs