projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1132 by passing segment IDs, not segment instances
[pulseview.git]
/
pv
/
binding
/
binding.cpp
diff --git
a/pv/binding/binding.cpp
b/pv/binding/binding.cpp
index fccb96be54b83e6770a795d219aae7ac07125bae..ae4f2943bdfe988a9dc6e82af5337525c317c04f 100644
(file)
--- a/
pv/binding/binding.cpp
+++ b/
pv/binding/binding.cpp
@@
-14,24
+14,26
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <cassert>
#include <QFormLayout>
*/
#include <cassert>
#include <QFormLayout>
+#include <QLabel>
#include <pv/prop/property.hpp>
#include "binding.hpp"
using std::shared_ptr;
#include <pv/prop/property.hpp>
#include "binding.hpp"
using std::shared_ptr;
+using std::string;
+using std::vector;
namespace pv {
namespace binding {
namespace pv {
namespace binding {
-const
std::vector< std::
shared_ptr<prop::Property> >& Binding::properties()
+const
vector<
shared_ptr<prop::Property> >& Binding::properties()
{
return properties_;
}
{
return properties_;
}
@@
-49,16
+51,18
@@
void Binding::add_properties_to_form(QFormLayout *layout,
{
assert(layout);
{
assert(layout);
- for (shared_ptr<pv::prop::Property> p : properties_)
- {
+ for (shared_ptr<pv::prop::Property> p : properties_) {
assert(p);
QWidget *const widget = p->get_widget(layout->parentWidget(),
auto_commit);
assert(p);
QWidget *const widget = p->get_widget(layout->parentWidget(),
auto_commit);
- if (p->labeled_widget())
+ if (p->labeled_widget())
{
layout->addRow(widget);
layout->addRow(widget);
- else
- layout->addRow(p->name(), widget);
+ } else {
+ auto *lbl = new QLabel(p->name());
+ lbl->setToolTip(p->desc());
+ layout->addRow(lbl, widget);
+ }
}
}
}
}
@@
-80,7
+84,7
@@
QString Binding::print_gvariant(Glib::VariantBase gvar)
s = QString::fromStdString("(null)");
else if (gvar.is_of_type(Glib::VariantType("s")))
s = QString::fromStdString(
s = QString::fromStdString("(null)");
else if (gvar.is_of_type(Glib::VariantType("s")))
s = QString::fromStdString(
- Glib::VariantBase::cast_dynamic<Glib::Variant<st
d::st
ring>>(
+ Glib::VariantBase::cast_dynamic<Glib::Variant<string>>(
gvar).get());
else
s = QString::fromStdString(gvar.print());
gvar).get());
else
s = QString::fromStdString(gvar.print());
@@
-88,5
+92,5
@@
QString Binding::print_gvariant(Glib::VariantBase gvar)
return s;
}
return s;
}
-}
//
binding
-}
//
pv
+}
// namespace
binding
+}
// namespace
pv