diff --git a/RoboGlue.pro.user b/RoboGlue.pro.user index bd5c3ac..0542585 100644 --- a/RoboGlue.pro.user +++ b/RoboGlue.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/com/roboglue_com.cpp b/com/roboglue_com.cpp index 7b28096..73a0f35 100644 --- a/com/roboglue_com.cpp +++ b/com/roboglue_com.cpp @@ -6,7 +6,7 @@ RoboGlue_COM::RoboGlue_COM (RoboGlue_SHARED *mem): m(mem) { liblog = spdlog::stdout_logger_mt("URcom_liblog"); modlog = spdlog::stdout_logger_mt("RoboGlue_comlog"); liblog->set_level(spdlog::level::warn); - modlog->set_level(spdlog::level::trace); + modlog->set_level(spdlog::level::warn); ///////// INITIALIZE TCP SERVER /////////// server = new QTcpServer(this); diff --git a/gui/roboglue_gui.cpp b/gui/roboglue_gui.cpp index 177a47e..94cdb42 100644 --- a/gui/roboglue_gui.cpp +++ b/gui/roboglue_gui.cpp @@ -92,9 +92,9 @@ void RoboGlue_GUI::disableLockAxes(){ void RoboGlue_GUI::on_commonStatusChange() { modlog->trace("on_commonStatusChange Received"); // TODO: aggiungere e interpretare le flag per capire se i nodi ros sono tutti vivi dall'heartbeat - this->ui->lbl_relay->setText(QString().fromStdString(std::to_string(m->commonStatus.relayTime))); - this->ui->lbl_follower->setText(QString().fromStdString(std::to_string(m->commonStatus.followerTime))); - this->ui->lbl_recorder->setText(QString().fromStdString(std::to_string(m->commonStatus.recorderTime))); + this->ui->lbl_relay->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("relay")->second+": "+std::to_string(static_cast(m->commonStatus.relayTime)))); + this->ui->lbl_follower->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("follower")->second+": "+std::to_string(static_cast(m->commonStatus.followerTime)))); + this->ui->lbl_recorder->setText(QString().fromStdString(this->m->comSettings.nodeNames.find("recorder")->second+": "+std::to_string(static_cast(m->commonStatus.recorderTime)))); if(m->commonStatus.relayTime > m->comSettings.deadTime || m->commonStatus.followerTime > m->comSettings.deadTime || diff --git a/gui/roboglue_gui.ui b/gui/roboglue_gui.ui index 44eb567..a279a1b 100644 --- a/gui/roboglue_gui.ui +++ b/gui/roboglue_gui.ui @@ -6,8 +6,8 @@ 0 0 - 1108 - 760 + 948 + 826 @@ -441,7 +441,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -460,7 +460,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -479,7 +479,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -501,7 +501,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -520,7 +520,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -539,7 +539,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -591,7 +591,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -610,7 +610,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -629,7 +629,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -648,7 +648,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -667,7 +667,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -686,7 +686,7 @@ - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignCenter Qt::TextSelectableByMouse @@ -920,7 +920,7 @@ - + @@ -978,6 +978,9 @@ - + + Qt::AlignCenter + @@ -985,6 +988,9 @@ - + + Qt::AlignCenter + @@ -992,6 +998,9 @@ - + + Qt::AlignCenter + @@ -1348,7 +1357,7 @@ 0 0 - 1108 + 948 22 @@ -1370,12 +1379,12 @@ - - false + + diff --git a/shared/roboglue_shared.h b/shared/roboglue_shared.h index cbaa133..cca73e8 100644 --- a/shared/roboglue_shared.h +++ b/shared/roboglue_shared.h @@ -92,7 +92,7 @@ public: kineDH_t DHtable; float maxReach = 1.2; } kine; - double deadTime = 10.0; //default value + double deadTime = 1.0; //default value std::map subMap; std::map pubMap; std::map nodeNames;