Skip to content
Snippets Groups Projects
Commit ae781499 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Merge remote-tracking branch 'origin/master' into fix/cartographer

parents d9b9ae5d a43cb643
No related branches found
No related tags found
1 merge request!345Heartbeat updates
......@@ -89,7 +89,7 @@ namespace armarx
widget.doubleSpinBoxUpdateFreq->setSuffix(" Hz");
refreshSkillsResultTimer = new QTimer(this);
refreshSkillsResultTimer->setInterval(1000 / 5); // Keep this stable.
refreshSkillsResultTimer->setInterval(1000 / 2); // Keep this stable.
refreshSkillsResultTimer->start();
connect(widget.doubleSpinBoxUpdateFreq,
......@@ -129,15 +129,6 @@ namespace armarx
{
}
void
SkillManagerMonitorWidgetController::reconnectToSkillManager()
{
if (connected)
{
getProxy(manager, observerName, 1000);
}
}
void
SkillManagerMonitorWidgetController::onInitComponent()
{
......@@ -152,6 +143,7 @@ namespace armarx
QAbstractItemView::EditTrigger::NoEditTriggers);
widget.treeWidgetSkillDetails->setColumnHidden(3, true);
getProxy(manager, observerName, 1000);
connected = true;
}
......@@ -191,7 +183,6 @@ namespace armarx
if (!manager)
{
reconnectToSkillManager();
return;
}
......
......@@ -70,8 +70,6 @@ namespace armarx
return "Skills.Manager";
}
void reconnectToSkillManager();
void onInitComponent() override;
void onConnectComponent() override;
void onDisconnectComponent() override;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment