From bac49d2d36d22ad3b00932c46d18b11217c47dc5 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Tue, 13 Oct 2020 09:42:17 +0200
Subject: [PATCH] Make logging verbose instead of info
---
.../ObjectPoseGui/ObjectPoseGuiWidget.ui | 31 +++++++------
.../ObjectPoseGuiWidgetController.cpp | 43 ++++++++++++-------
2 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
index 00677428b..b6e436bb8 100644
--- a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
+++ b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>621</width>
- <height>350</height>
+ <width>736</width>
+ <height>391</height>
</rect>
</property>
<property name="windowTitle">
@@ -48,7 +48,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tabObjects">
<attribute name="title">
@@ -90,23 +90,23 @@
<string>Timestamp</string>
</property>
</column>
+ <column>
+ <property name="text">
+ <string>Attached</string>
+ </property>
+ </column>
<item>
<property name="text">
- <string>Provider2</string>
+ <string>Provider1</string>
</property>
<item>
<property name="text">
- <string>Dataset1/Object2</string>
+ <string>Dataset1/Object1</string>
</property>
<property name="text">
- <string>Provider2</string>
+ <string>Provider1</string>
</property>
</item>
- </item>
- <item>
- <property name="text">
- <string>Provider1</string>
- </property>
<item>
<property name="text">
<string>Dataset2/Object2/instance1</string>
@@ -115,12 +115,17 @@
<string>Provider1</string>
</property>
</item>
+ </item>
+ <item>
+ <property name="text">
+ <string>Provider2</string>
+ </property>
<item>
<property name="text">
- <string>Dataset1/Object1</string>
+ <string>Dataset1/Object2</string>
</property>
<property name="text">
- <string>Provider1</string>
+ <string>Provider2</string>
</property>
</item>
</item>
diff --git a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
index 828d0fb5b..4fc35cf54 100644
--- a/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
@@ -156,10 +156,10 @@ namespace armarx
}
IceUtil::Time start = IceUtil::Time::now();
- ARMARX_INFO << "Getting object poses...";
+ ARMARX_VERBOSE << "Getting object poses...";
const objpose::data::ObjectPoseSeq objectPosesIce = objectPoseObserver->getObjectPoses();
- ARMARX_INFO << "Got " << objectPosesIce.size() << " object poses. "
- << "(Took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.)";
+ ARMARX_VERBOSE << "Got " << objectPosesIce.size() << " object poses. "
+ << "(Took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.)";
const objpose::ObjectPoseSeq objectPoses = objpose::fromIce(objectPosesIce);
@@ -200,20 +200,31 @@ namespace armarx
item->setText(col++, QString::fromStdString(pose.providerName));
item->setText(col++, QString::fromStdString(objpose::ObjectTypeEnumNames.to_name(pose.objectType)));
- std::stringstream ss;
- if (pose.localOOBB)
{
- static const Eigen::IOFormat iof(5, 0, "", " x ", "", "", "", "");
- ss << pose.localOOBB->dimensions().format(iof);
+ std::stringstream ss;
+ if (pose.localOOBB)
+ {
+ static const Eigen::IOFormat iof(5, 0, "", " x ", "", "", "", "");
+ ss << pose.localOOBB->dimensions().format(iof);
+ }
+ else
+ {
+ ss << "None";
+ }
+ item->setText(col++, QString::fromStdString(ss.str()));
}
- else
- {
- ss << "None";
- }
- item->setText(col++, QString::fromStdString(ss.str()));
item->setText(col++, QString::number(double(pose.confidence), 'g', 2));
item->setText(col++, QString::fromStdString(TimeUtil::toStringDateTime(pose.timestamp)));
+ {
+ std::stringstream ss;
+ if (pose.attachment)
+ {
+ ss << pose.attachment->agentName << "/" << pose.attachment->frameName;
+ }
+ item->setText(col++, QString::fromStdString(ss.str()));
+ }
+
return true;
});
builder.updateTree(item, objectPoses);
@@ -227,7 +238,7 @@ namespace armarx
});
builder.updateTree(tree, objectPosesByProvider);
- ARMARX_INFO << "Gui update took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.";
+ ARMARX_VERBOSE << "Gui update took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.";
}
@@ -241,8 +252,8 @@ namespace armarx
IceUtil::Time start = IceUtil::Time::now();
objpose::ProviderInfoMap availableProvidersInfo = objectPoseObserver->getAvailableProvidersInfo();
- ARMARX_INFO << "Got infos of " << availableProvidersInfo.size() << " object pose providers. "
- << "(Took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.)";
+ ARMARX_VERBOSE << "Got infos of " << availableProvidersInfo.size() << " object pose providers. "
+ << "(Took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.)";
// Restructure data.
@@ -300,7 +311,7 @@ namespace armarx
});
builder.updateTree(tree, data);
- ARMARX_INFO << "Gui update took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.";
+ ARMARX_VERBOSE << "Gui update took " << (IceUtil::Time::now() - start).toMilliSecondsDouble() << " ms.";
}
void ObjectPoseGuiWidgetController::requestSelectedObjects()
--
GitLab