diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
index c2e783dfbcf44a2540084eee19ebddcbe62996df..8c1b2fa4bc1e3a5a0e3ee10aaa2432c55a5432f4 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/connectstartstopbar.ui
@@ -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">
@@ -117,21 +117,21 @@
<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">
@@ -162,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">
@@ -188,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">
@@ -213,13 +213,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">
@@ -237,8 +237,8 @@
</property>
<property name="minimumSize">
<size>
- <width>90</width>
- <height>70</height>
+ <width>72</width>
+ <height>55</height>
</size>
</property>
<property name="maximumSize">
@@ -263,13 +263,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="font">
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
index cfd93a07775814565b809f542948599d0a0d65c9..c1f3085fb22aa85236d51053a9d607d13a30dae9 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/controllertabs.ui
@@ -28,7 +28,7 @@
<item row="0" column="0">
<widget class="QTabWidget" name="controller_tabs_widget">
<property name="currentIndex">
- <number>2</number>
+ <number>3</number>
</property>
<widget class="QWidget" name="default_tab">
<attribute name="title">
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
index 5c0dc3644bd50811dce99ec132421a9750f7b410..fc0b70b382b9b3a6567b6a31db30dfdb0d0dc450 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/defaultcontrollertab.ui
@@ -54,6 +54,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="4" column="0">
@@ -131,6 +134,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="0" column="1">
@@ -399,6 +405,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="5" column="7">
@@ -524,6 +533,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="2" column="2">
@@ -548,6 +560,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="1" column="2">
@@ -588,6 +603,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="4" column="1">
@@ -612,6 +630,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="5" column="1">
@@ -636,6 +657,9 @@
<property name="text">
<string>xx.xx</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
</widget>
</item>
<item row="5" column="0">
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
index 704e95abc4d213f955f9206470a1883505749bdd..0537109e7ab005624a928a35e08cff789e3e6ff8 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/enablecontrollerloadyamlbar.ui
@@ -41,13 +41,13 @@
<property name="minimumSize">
<size>
<width>60</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="font">
@@ -72,13 +72,13 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="font">
@@ -106,13 +106,13 @@
<property name="minimumSize">
<size>
<width>60</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="font">
@@ -246,13 +246,13 @@
<property name="minimumSize">
<size>
<width>60</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="font">
@@ -277,13 +277,13 @@
<property name="minimumSize">
<size>
<width>60</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>180</width>
- <height>70</height>
+ <height>50</height>
</size>
</property>
<property name="font">
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
index 28300e78fefb18b780f6578086da3d01e8ffc06e..832f4f81edf5fa5473dcb131a3454ce538d4f132 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/mainwindow.ui
@@ -54,22 +54,29 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="Line" name="coordinator_to_main_panel_vertical_line">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>6</number>
</property>
<property name="leftMargin">
- <number>6</number>
+ <number>12</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="TopBanner" name="customWidget_topBanner" native="true">
@@ -93,6 +100,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="Line" name="line_1">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="ConnectStartStopBar" name="customWidget_connectStartStopBar" native="true">
<property name="sizePolicy">
@@ -115,6 +129,13 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="EnableControllerLoadYamlBar" name="customWidget_enableControllerLoadYamlBar" native="true">
<property name="enabled">
@@ -141,33 +162,21 @@
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>6</number>
- </property>
- <property name="leftMargin">
- <number>6</number>
- </property>
- <property name="topMargin">
- <number>6</number>
+ <widget class="Line" name="line_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="rightMargin">
- <number>6</number>
- </property>
- <property name="bottomMargin">
- <number>6</number>
+ </widget>
+ </item>
+ <item>
+ <widget class="ControllerTabs" name="customWidget_controller_tabs" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <item>
- <widget class="ControllerTabs" name="customWidget_controller_tabs" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
</layout>
</item>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
index 0198a2db92cbb897fe7ba77a131b0a2dc72967c4..75b32f76b0b6360a17143d4f9f94df63478908ce 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/topbanner.ui
@@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1049</width>
+ <width>1418</width>
<height>300</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>20</pointsize>
+ <pointsize>18</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -27,13 +27,13 @@
<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>
<property name="spacing">
<number>6</number>
@@ -54,6 +54,31 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="emergency_stop_button">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>60</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>ES</string>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
index 0eecff4b8f9ec63517b6028755ee37d67f5f82e1..33ad470c576f5c358475a5c3d9dea3110ab2d214 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/defaultcontrollertab.h
@@ -2,6 +2,7 @@
#define DEFAULTCONTROLLERTAB_H
#include <QWidget>
+#include <QTextStream>
namespace Ui {
class DefaultControllerTab;
@@ -15,6 +16,14 @@ public:
explicit DefaultControllerTab(QWidget *parent = 0);
~DefaultControllerTab();
+private slots:
+ void on_lineEdit_setpoint_new_x_returnPressed();
+ void on_lineEdit_setpoint_new_y_returnPressed();
+ void on_lineEdit_setpoint_new_z_returnPressed();
+ void on_lineEdit_setpoint_new_yaw_returnPressed();
+
+ void on_set_setpoint_button_clicked();
+
private:
Ui::DefaultControllerTab *ui;
};
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h
index 7a7b3e3a6bee98128746095365f92bb140cefb98..57faad7547c2a96a3dbb27582eacd61dc184f032 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/include/topbanner.h
@@ -100,7 +100,7 @@ private:
- #ifdef CATKIN_MAKE
+#ifdef CATKIN_MAKE
// --------------------------------------------------- //
// PRIVATE VARIABLES FOR ROS
@@ -123,9 +123,15 @@ private:
// > For the notification that the database was changes,
// received on the "DatabaseChangedSubscriber"
void databaseChangedCallback(const std_msgs::Int32& msg);
+#endif
-#endif
+private slots:
+
+ // PRIVATE METHODS FOR BUTTON CALLBACKS
+ // > For the emergency stop button
+ void on_emergency_stop_button_clicked();
+
};
#endif // TOPBANNER_H
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
index f35ee39e57f15b915207ea93b32b6cfa88784de9..274304500eaf19ebe7d2c360095b86b1186f1753 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/defaultcontrollertab.cpp
@@ -12,3 +12,39 @@ DefaultControllerTab::~DefaultControllerTab()
{
delete ui;
}
+
+void DefaultControllerTab::on_lineEdit_setpoint_new_x_returnPressed()
+{
+ ui->set_setpoint_button->animateClick();
+
+#ifdef CATKIN_MAKE
+#else
+ // TO ASSIST WITH DEBUGGING WHEN COMPILED AND RUN IN "QtCreator"
+ QTextStream(stdout) << "[DEFAULT CONTROLLER TAB] return pressed for x setpoint";
+#endif
+}
+
+void DefaultControllerTab::on_lineEdit_setpoint_new_y_returnPressed()
+{
+ ui->set_setpoint_button->animateClick();
+}
+
+void DefaultControllerTab::on_lineEdit_setpoint_new_z_returnPressed()
+{
+ ui->set_setpoint_button->animateClick();
+}
+
+void DefaultControllerTab::on_lineEdit_setpoint_new_yaw_returnPressed()
+{
+ ui->set_setpoint_button->animateClick();
+}
+
+void DefaultControllerTab::on_set_setpoint_button_clicked()
+{
+
+#ifdef CATKIN_MAKE
+#else
+ // TO ASSIST WITH DEBUGGING WHEN COMPILED AND RUN IN "QtCreator"
+ QTextStream(stdout) << "[DEFAULT CONTROLLER TAB] set setpoint button clicked";
+#endif
+}
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
index e0c4905436735e81cbee708b92115bad5c24daa4..2890865534f0f48097abf5f06a36b1a127bc7f0c 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/enablecontrollerloadyamlbar.cpp
@@ -172,17 +172,6 @@ void EnableControllerLoadYamlBar::setAgentIDsToCoordinate(QVector<int> agentIDs
}
// Unlock the mutex
m_agentIDs_toCoordinate_mutex.unlock();
-
-#ifdef CATKIN_MAKE
-#else
- // TO ASSIST WITH DEBUGGING WHEN COMPILED AND RUN IN "QtCreator"
- QTextStream(stdout) << "[CONNECT START STOP GUI BAR] is coordinating agentIDs:";
- for ( int irow = 0 ; irow < agentIDs.length() ; irow++ )
- {
- QTextStream(stdout) << " " << agentIDs[irow];
- }
- QTextStream(stdout) << " " << endl;
-#endif
}
@@ -385,4 +374,4 @@ bool EnableControllerLoadYamlBar::getTypeAndIDParameters()
// Return
return return_was_successful;
}
-#endif
\ No newline at end of file
+#endif
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
index 65645bb8aa79b97d93bf104a25ba4d940b559b01..2350a5c6a1201523fe1ef35b7abc3ce7e4f3c256 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/mainwindow.cpp
@@ -121,12 +121,14 @@ void MainWindow::on_actionShowHide_Coordinator_triggered()
if ( ui->customWidget_coordinator->isHidden() )
{
ui->customWidget_coordinator->show();
+ ui->coordinator_to_main_panel_vertical_line->show();
QString qstr = "Hide Coordinator";
ui->actionShowHide_Coordinator->setText(qstr);
}
else
{
ui->customWidget_coordinator->hide();
+ ui->coordinator_to_main_panel_vertical_line->hide();
QString qstr = "Show Coordinator";
ui->actionShowHide_Coordinator->setText(qstr);
}
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
index 771eed6b4a97df441f470654b8c62fecd0b73bd8..5928885b819e8982c780df9561ac7d84638c32f4 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
@@ -36,7 +36,12 @@
#include "topbanner.h"
#include "ui_topbanner.h"
+#ifdef CATKIN_MAKE
+#else
+// Include the shared definitions
+#include "include/Constants_for_Qt_compile.h"
+#endif
@@ -45,12 +50,19 @@ TopBanner::TopBanner(QWidget *parent) :
ui(new Ui::TopBanner)
{
ui->setupUi(this);
+ (":/images/rf_connected.png");
+ QPixmap pixmap(":/images/rf_connected.png");
+ QIcon ButtonIcon(pixmap);
+ ui->emergency_stop_button->setText("");
+ ui->emergency_stop_button->setIcon(ButtonIcon);
+ ui->emergency_stop_button->setIconSize(QSize(50,50));
+ //ui->emergency_stop_button->setIconSize(pixmap.rect().size());
#ifdef CATKIN_MAKE
// Get the namespace of this node
std::string base_namespace = ros::this_node::getNamespace();
- ROS_INFO_STREAM("[CONNECT START STOP GUI BAR] ros::this_node::getNamespace() = " << base_namespace);
+ ROS_INFO_STREAM("[TOP BANNER GUI] ros::this_node::getNamespace() = " << base_namespace);
// Get the type and ID of this parameter service
@@ -59,7 +71,7 @@ TopBanner::TopBanner(QWidget *parent) :
// Stall if the TYPE and ID are not valid
if ( !isValid_type_and_ID )
{
- ROS_ERROR("[CONNECT START STOP GUI BAR] Node NOT FUNCTIONING :-)");
+ ROS_ERROR("[TOP BANNER GUI] Node NOT FUNCTIONING :-)");
ros::spin();
}
#else
@@ -133,7 +145,7 @@ TopBanner::~TopBanner()
// > For the notification that the database was changes, received on the "DatabaseChangedSubscriber"
void TopBanner::databaseChangedCallback(const std_msgs::Int32& msg)
{
- //ROS_INFO_STEAM("[COORDINATOR ROW GUI] Database Changed Callback called for agentID = " << m_agentID);
+ //ROS_INFO_STEAM("[TOP BANNER GUI] Database Changed Callback called for agentID = " << m_agentID);
loadCrazyflieContext();
}
#endif
@@ -194,6 +206,30 @@ void TopBanner::loadCrazyflieContext()
+// ----------------------------------------------------------------------------------
+// BBBB U U TTTTT TTTTT OOO N N SSSS
+// B B U U T T O O NN N S
+// BBBB U U T T O O N N N SSS
+// B B U U T T O O N NN S
+// BBBB UUU T T OOO N N SSSS
+// ----------------------------------------------------------------------------------
+
+
+
+void TopBanner::on_emergency_stop_button_clicked()
+{
+#ifdef CATKIN_MAKE
+ d_fall_pps::IntWithHeader msg;
+ fillIntMessageHeader(msg);
+ msg.data = CMD_RECONNECT;
+ this->crazyRadioCommandPublisher.publish(msg);
+ ROS_INFO("[TOP BANNER GUI] EMERGENCY STOP button clicked");
+#endif
+}
+
+
+
+
// ----------------------------------------------------------------------------------
// III DDDD &&& TTTTT Y Y PPPP EEEEE
@@ -220,7 +256,7 @@ bool TopBanner::getTypeAndIDParameters()
if(!nodeHandle.getParam("type", type_string))
{
// Throw an error if the agent ID parameter could not be obtained
- ROS_ERROR("[CONNECT START STOP GUI BAR] Failed to get type");
+ ROS_ERROR("[TOP BANNER GUI] Failed to get type");
}
// Set the "m_type" class variable based on this string loaded
@@ -237,7 +273,7 @@ bool TopBanner::getTypeAndIDParameters()
// Set "m_type" to the value indicating that it is invlid
m_type = TYPE_INVALID;
return_was_successful = false;
- ROS_ERROR("[CONNECT START STOP GUI BAR] The 'type' parameter retrieved was not recognised.");
+ ROS_ERROR("[TOP BANNER GUI] The 'type' parameter retrieved was not recognised.");
}
@@ -251,12 +287,12 @@ bool TopBanner::getTypeAndIDParameters()
{
// Throw an error if the agent ID parameter could not be obtained
return_was_successful = false;
- ROS_ERROR("[CONNECT START STOP GUI BAR] Failed to get agentID");
+ ROS_ERROR("[TOP BANNER GUI] Failed to get agentID");
}
else
{
// Inform the user about the type and ID
- ROS_INFO_STREAM("[CONNECT START STOP GUI BAR] Is of type AGENT with ID = " << m_ID);
+ ROS_INFO_STREAM("[TOP BANNER GUI] Is of type AGENT with ID = " << m_ID);
}
break;
}
@@ -270,12 +306,12 @@ bool TopBanner::getTypeAndIDParameters()
{
// Throw an error if the coord ID parameter could not be obtained
return_was_successful = false;
- ROS_ERROR("[CONNECT START STOP GUI BAR] Failed to get coordID");
+ ROS_ERROR("[TOP BANNER GUI] Failed to get coordID");
}
else
{
// Inform the user about the type and ID
- ROS_INFO_STREAM("[CONNECT START STOP GUI BAR] Is of type COORDINATOR with ID = " << m_ID);
+ ROS_INFO_STREAM("[TOP BANNER GUI] Is of type COORDINATOR with ID = " << m_ID);
}
break;
}
@@ -284,7 +320,7 @@ bool TopBanner::getTypeAndIDParameters()
{
// Throw an error if the type is not recognised
return_was_successful = false;
- ROS_ERROR("[CONNECT START STOP GUI BAR] The 'm_type' variable was not recognised.");
+ ROS_ERROR("[TOP BANNER GUI] The 'm_type' variable was not recognised.");
break;
}
}
@@ -292,4 +328,4 @@ bool TopBanner::getTypeAndIDParameters()
// Return
return return_was_successful;
}
-#endif
\ No newline at end of file
+#endif