Fixed layout of labeled widgets

[pulseview.git] / pv / prop / binding / binding.cpp

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 5d411686f4a820f8ea686e191091f1b6d8c5500b..ec3127254b71c8e82085b4cb0f802020c65e2aa0 100644 (file)
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -18,53 +18,61 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <QFormLayout>
-#include <QWidget>
-
 #include <boost/foreach.hpp>
 
-#include "binding.h"
+#include <QFormLayout>
 
 #include <pv/prop/property.h>
 
-using namespace boost;
+#include "binding.h"
+
+using boost::shared_ptr;
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-Binding::Binding() :
-       _form(NULL)
+const std::vector< boost::shared_ptr<Property> >& Binding::properties()
 {
+       return _properties;
 }
 
-QWidget* Binding::get_form(QWidget *parent)
+void Binding::commit()
 {
-       if (_form)
-               return _form;
-
-       _form = new QWidget(parent);
-       QFormLayout *const layout = new QFormLayout(_form);
-       _form->setLayout(layout);
-
-       BOOST_FOREACH(shared_ptr<Property> p, _properties)
-       {
+       BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties) {
                assert(p);
-               layout->addRow(p->name(), p->get_widget(_form));
+               p->commit();
        }
-
-       return _form;
 }
 
-void Binding::commit()
+void Binding::add_properties_to_form(QFormLayout *layout,
+       bool auto_commit) const
 {
-       BOOST_FOREACH(shared_ptr<Property> p, _properties)
+       assert(layout);
+
+       BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
        {
                assert(p);
-               p->commit();
+
+               QWidget *const widget = p->get_widget(layout->parentWidget(),
+                       auto_commit);
+               if (p->labeled_widget())
+                       layout->addRow(widget);
+               else
+                       layout->addRow(p->name(), widget);
        }
 }
 
+QWidget* Binding::get_property_form(QWidget *parent,
+       bool auto_commit) const
+{
+       QWidget *const form = new QWidget(parent);
+       QFormLayout *const layout = new QFormLayout(form);
+       form->setLayout(layout);
+       add_properties_to_form(layout, auto_commit);
+       return form;
+}
+
 } // binding
 } // prop
 } // pv