From 2f5963019731081155e5a0840fbd9455bb6e1b80 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Mon, 18 Nov 2019 11:25:51 +0100
Subject: [PATCH] Modificato il modo di colorare le label per nodi ROS

---
 RoboGlue.pro.user          |  2 +-
 gui/roboglue_gui.cpp       | 23 ++++++++---------------
 gui/roboglue_gui.ui        |  7 +++++++
 shared/roboglue_shared.cpp |  8 ++++----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/RoboGlue.pro.user b/RoboGlue.pro.user
index 0d5c9f7..cb550ca 100644
--- a/RoboGlue.pro.user
+++ b/RoboGlue.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.8.2, 2019-11-14T17:08:08. -->
+<!-- Written by QtCreator 4.8.2, 2019-11-15T17:00:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/gui/roboglue_gui.cpp b/gui/roboglue_gui.cpp
index 4c1c6ec..da98127 100644
--- a/gui/roboglue_gui.cpp
+++ b/gui/roboglue_gui.cpp
@@ -96,21 +96,14 @@ void RoboGlue_GUI::on_commonStatusChange() {
     this->ui->lbl_follower->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("follower")->second+": "+std::to_string(static_cast<uint>(m->commonStatus.followerTime))));
     this->ui->lbl_recorder->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("recorder")->second+": "+std::to_string(static_cast<uint>(m->commonStatus.recorderTime))));
     this->ui->lbl_broadcaster->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("broadcaster")->second+": "+std::to_string(static_cast<uint>(m->commonStatus.broadcasterTime))));
-
-    if(m->commonStatus.relayTime > m->comSettings.deadTime ||
-            m->commonStatus.followerTime > m->comSettings.deadTime ||
-            m->commonStatus.recorderTime > m->comSettings.deadTime ||
-            m->commonStatus.broadcasterTime > m->comSettings.deadTime) {
-        this->ui->lbl_relay->setStyleSheet("QLabel { background-color : red; color : white; }");
-        this->ui->lbl_follower->setStyleSheet("QLabel { background-color : red; color : white; }");
-        this->ui->lbl_recorder->setStyleSheet("QLabel { background-color : red; color : white; }");
-        this->ui->lbl_broadcaster->setStyleSheet("QLabel { background-color : red; color : white; }");
-    } else {
-        this->ui->lbl_relay->setStyleSheet("QLabel { background-color : green; color : white; }");
-        this->ui->lbl_follower->setStyleSheet("QLabel { background-color : green; color : white; }");
-        this->ui->lbl_recorder->setStyleSheet("QLabel { background-color : green; color : white; }");
-        this->ui->lbl_broadcaster->setStyleSheet("QLabel { background-color : green; color : white; }");
-    }
+    if (m->commonStatus.relayRunning) this->ui->lbl_relay->setStyleSheet("QLabel { background-color : red; color : white; }");
+    else this->ui->lbl_relay->setStyleSheet("QLabel { background-color : green; color : white; }");
+    if (m->commonStatus.recorderRunning) this->ui->lbl_recorder->setStyleSheet("QLabel { background-color : red; color : white; }");
+    else this->ui->lbl_recorder->setStyleSheet("QLabel { background-color : green; color : white; }");
+    if (m->commonStatus.followerRunning) this->ui->lbl_follower->setStyleSheet("QLabel { background-color : red; color : white; }");
+    else this->ui->lbl_follower->setStyleSheet("QLabel { background-color : green; color : white; }");
+    if (m->commonStatus.broadcasterRunning) this->ui->lbl_broadcaster->setStyleSheet("QLabel { background-color : red; color : white; }");
+    else this->ui->lbl_broadcaster->setStyleSheet("QLabel { background-color : green; color : white; }");
 }
 
 void RoboGlue_GUI::on_pad_hoverEvent(QEvent* e) {
diff --git a/gui/roboglue_gui.ui b/gui/roboglue_gui.ui
index a1e44f6..b2d7376 100644
--- a/gui/roboglue_gui.ui
+++ b/gui/roboglue_gui.ui
@@ -1437,6 +1437,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QPushButton" name="btn_stopRos">
+        <property name="text">
+         <string>Stop_ROS</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </item>
    </layout>
diff --git a/shared/roboglue_shared.cpp b/shared/roboglue_shared.cpp
index a0d93ba..c31baa7 100644
--- a/shared/roboglue_shared.cpp
+++ b/shared/roboglue_shared.cpp
@@ -16,10 +16,10 @@ RoboGlue_SHARED::~RoboGlue_SHARED(){
 
 void RoboGlue_SHARED::on_statusTimer(void){
     double curTime = static_cast<double>(std::time(NULL));
-    commonStatus.relayTime = fabs(commonStatus.relayLast - curTime);
-    commonStatus.followerTime = fabs(commonStatus.followerLast - curTime);
-    commonStatus.recorderTime = fabs(commonStatus.recorderLast - curTime);
-    commonStatus.broadcasterTime = fabs(commonStatus.broadcasterLast - curTime);
+    commonStatus.relayRunning = (commonStatus.relayTime = fabs(commonStatus.relayLast - curTime)) < comSettings.deadTime;
+    commonStatus.followerRunning = (commonStatus.followerTime = fabs(commonStatus.followerLast - curTime)) < comSettings.deadTime;
+    commonStatus.recorderRunning = (commonStatus.recorderTime = fabs(commonStatus.recorderLast - curTime)) < comSettings.deadTime;
+    commonStatus.broadcasterRunning = (commonStatus.broadcasterTime = fabs(commonStatus.broadcasterLast - curTime)) < comSettings.deadTime;
     emit this->commonStatusChange();
 }
 ////////////////////////////////////////////////////////////////