From 08cdf2e3dc0ecb593330a9f3c0f75c64fd0480a9 Mon Sep 17 00:00:00 2001
From: armar4-user <armar4-user@kit.edu>
Date: Mon, 20 Mar 2017 12:58:09 +0100
Subject: [PATCH] KinematicUnitGui: Removed kinematic unit label
---
.../KinematicUnitGuiPlugin.cpp | 25 ++++++++-----------
.../kinematicunitguiplugin.ui | 13 ----------
2 files changed, 11 insertions(+), 27 deletions(-)
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index b04f22369..afb239586 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -135,9 +135,6 @@ void KinematicUnitWidgetController::onInitComponent()
rootVisu->addChild(debugLayerVisu);
}
- string widgetLabel = "KinematicUnit: " + kinematicUnitName;
- ui.labelKinematicUnitName->setText(QString(widgetLabel.c_str()));
-
connectSlots();
usingProxy(kinematicUnitName);
@@ -163,7 +160,7 @@ void KinematicUnitWidgetController::onConnectComponent()
packages.push_back(Application::GetProjectName());
ARMARX_VERBOSE << "ArmarX packages " << packages;
- for (const std::string & projectName : packages)
+ for (const std::string& projectName : packages)
{
if (projectName.empty())
{
@@ -373,7 +370,7 @@ void KinematicUnitWidgetController::copyToClipboard()
}
JSONObjectPtr serializer = new JSONObject();
- for (auto & kv : values)
+ for (auto& kv : values)
{
serializer->setFloat(kv.first, kv.second);
}
@@ -892,14 +889,14 @@ void KinematicUnitWidgetController::updateControlModesTable()
switch (currentMode)
{
- /*case eNoMode:
- state = "None";
- break;
-
- case eUnknownMode:
- state = "Unknown";
- break;
- */
+ /*case eNoMode:
+ state = "None";
+ break;
+
+ case eUnknownMode:
+ state = "Unknown";
+ break;
+ */
case eDisabled:
state = "Disabled";
break;
@@ -1205,7 +1202,7 @@ void KinematicUnitWidgetController::reportControlModeChanged(const NameControlMo
// return;
boost::recursive_mutex::scoped_lock lock(mutexNodeSet);
- for (auto & e : jointModes)
+ for (auto& e : jointModes)
{
// ARMARX_INFO << "Setting jointMode of joint " << e.first << " to " << e.second;
diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
index 333937df6..45a035b39 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
@@ -31,19 +31,6 @@
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
- <item>
- <widget class="QLabel" name="labelKinematicUnitName">
- <property name="font">
- <font>
- <family>AlArabiya</family>
- <pointsize>14</pointsize>
- </font>
- </property>
- <property name="text">
- <string>KinematicUnit</string>
- </property>
- </widget>
- </item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0" colspan="2">
--
GitLab