Add WidgetDescription::LabeledWidget

source/ArmarXGui/interface/WidgetDescription.ice

@@ -35,6 +35,13 @@ module armarx
         sequence<Widget> WidgetSeq;
         dictionary<string,Widget> StringWidgetDictionary;
 
+        class LabeledWidget
+        {
+            string label;
+            Widget w;
+        };
+        sequence<LabeledWidget> LabeledWidgetSeq;
+
         //Layouts
         class HBoxLayout extends Widget
         {

source/ArmarXGui/libraries/DefaultWidgetDescriptions/DefaultWidgetDescriptions.h

@@ -46,6 +46,7 @@ namespace armarx
             FloatRange rangeRoll  = { -M_PI, M_PI},
             FloatRange rangePitch = { -M_PI, M_PI},
             FloatRange rangeYaw   = { -M_PI, M_PI});
+
         inline HBoxLayoutPtr makeXYZRollPitchYawWidget(
             const std::string& namePrefix,
             FloatRange rangeLin,
@@ -53,6 +54,14 @@ namespace armarx
         {
             return makeXYZRollPitchYawWidget(namePrefix, 0, 0, 0, 0, 0, 0, rangeLin, rangeLin, rangeLin, rangeAng, rangeAng, rangeAng);
         }
+
+        inline LabeledWidgetPtr makeLabeledWidget(std::string name, WidgetPtr widget)
+        {
+            LabeledWidgetPtr w = new LabeledWidget;
+            w->label = std::move(name);
+            w->w = std::move(widget);
+            return w;
+        }
     }
 }
 

source/ArmarXGui/libraries/WidgetDescription/WidgetDescription.cpp

@@ -114,6 +114,23 @@ namespace armarx
         };
         DescribedWidgetFactoryRegistration<DescribedFormLayout> registerDescribedFormLayout {FormLayout::ice_staticId()};
 
+        class DescribedLabeledWidget : public DescribedWidgetLayoutBase
+        {
+        public:
+            DescribedLabeledWidget(const WidgetPtr& p, ValueChangedListenerInterface* listener)
+                : DescribedWidgetLayoutBase(listener)
+            {
+                LabeledWidgetPtr ptr = LabeledWidgetPtr::dynamicCast(p);
+                ARMARX_CHECK_EXPRESSION(ptr);
+                auto l = new QHBoxLayout;
+                setLayout(l);
+                layout()->setContentsMargins(0, 0, 0, 0);
+                l->addWidget(new QLabel {QString::fromStdString(ptr->label)});
+                addChild(ptr->w);
+                l->addWidget(children.back());
+            }
+        };
+        DescribedWidgetFactoryRegistration<DescribedLabeledWidget> registerDescribedLabeledWidget {LabeledWidget::ice_staticId()};
         //static elements
         class DescribedHSpacer : public DescribedWidgetBase
         {