Commit 9eb36b33 authored by DreamSourceLab's avatar DreamSourceLab
Browse files

v0.4 release

parent 5d7e3237
......@@ -45,7 +45,7 @@
#include <libsigrok4DSLogic/libsigrok.h>
#include "fakelineedit.h"
#include "../widgets/fakelineedit.h"
namespace pv {
......@@ -55,6 +55,10 @@ namespace view {
class View;
}
namespace widgets {
class FakeLineEdit;
}
namespace dock {
class SearchDock : public QWidget
......@@ -86,7 +90,7 @@ private:
QPushButton _pre_button;
QPushButton _nxt_button;
FakeLineEdit* _search_value;
widgets::FakeLineEdit* _search_value;
};
} // namespace dock
......
......@@ -23,6 +23,7 @@
#include "triggerdock.h"
#include "../sigsession.h"
#include "../device/devinst.h"
#include <QObject>
#include <QGridLayout>
......@@ -209,7 +210,7 @@ void TriggerDock::simple_trigger()
void TriggerDock::adv_trigger()
{
if (strcmp(_session.get_device()->driver->name, "DSLogic") == 0) {
if (strcmp(_session.get_device()->dev_inst()->driver->name, "DSLogic") == 0) {
widget_enable();
ds_trigger_set_mode(ADV_TRIGGER);
_session.set_adv_trigger(true);
......@@ -341,7 +342,7 @@ void TriggerDock::pos_changed(int pos)
void TriggerDock::device_change()
{
if (strcmp(_session.get_device()->driver->name, "DSLogic") != 0) {
if (strcmp(_session.get_device()->dev_inst()->driver->name, "DSLogic") != 0) {
position_spinBox->setDisabled(true);
position_slider->setDisabled(true);
} else {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -24,9 +24,14 @@
#ifndef DSLOGIC_PV_PROP_BINDING_BINDING_H
#define DSLOGIC_PV_PROP_BINDING_BINDING_H
#include <glib.h>
#include <vector>
#include <boost/shared_ptr.hpp>
#include <QString>
class QFormLayout;
class QWidget;
namespace pv {
......@@ -41,6 +46,16 @@ class Binding
public:
const std::vector< boost::shared_ptr<Property> >& properties();
void commit();
void add_properties_to_form(QFormLayout *layout,
bool auto_commit = false) const;
QWidget* get_property_form(QWidget *parent,
bool auto_commit = false) const;
static QString print_gvariant(GVariant *const gvar);
protected:
std::vector< boost::shared_ptr<Property> > _properties;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -33,16 +33,21 @@ namespace prop {
class Bool : public Property
{
Q_OBJECT;
public:
Bool(QString name, Getter getter, Setter setter);
virtual ~Bool();
QWidget* get_widget(QWidget *parent);
QWidget* get_widget(QWidget *parent, bool auto_commit);
bool labeled_widget() const;
void commit();
private slots:
void on_state_changed(int);
private:
QCheckBox *_check_box;
};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment