projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added pv::widgets::PopupToolButton
[pulseview.git]
/
pv
/
prop
/
binding
/
binding.cpp
diff --git
a/pv/prop/binding/binding.cpp
b/pv/prop/binding/binding.cpp
index 5d411686f4a820f8ea686e191091f1b6d8c5500b..28a47099144eb8d50883a8d602c2f2d210a56c78 100644
(file)
--- a/
pv/prop/binding/binding.cpp
+++ b/
pv/prop/binding/binding.cpp
@@
-18,53
+18,54
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <QFormLayout>
-#include <QWidget>
-
#include <boost/foreach.hpp>
#include <boost/foreach.hpp>
-#include
"binding.h"
+#include
<QFormLayout>
#include <pv/prop/property.h>
#include <pv/prop/property.h>
+#include "binding.h"
+
using namespace boost;
namespace pv {
namespace prop {
namespace binding {
using namespace boost;
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);
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) const
{
{
- BOOST_FOREACH(shared_ptr<Property> p, _properties)
+ assert(layout);
+
+ BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
{
assert(p);
{
assert(p);
- p->commit();
+ const QString label = p->labeled_widget() ? QString() : p->name();
+ layout->addRow(label, p->get_widget(layout->parentWidget()));
}
}
}
}
+QWidget* Binding::get_property_form(QWidget *parent) const
+{
+ QWidget *const form = new QWidget(parent);
+ QFormLayout *const layout = new QFormLayout(form);
+ form->setLayout(layout);
+ add_properties_to_form(layout);
+ return form;
+}
+
} // binding
} // prop
} // pv
} // binding
} // prop
} // pv