X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fdevice.hpp;h=aceac8cc6f2fc3346f1c36de9c58c5b6b58d081b;hb=119c5c232ef47e92ef6a5cc9f8b7c4c31dc2f387;hp=2a4c51634ed2ae734bc5b81a245054552822cde6;hpb=3cc9ad7b867853315473df611612c562d562ed8a;p=pulseview.git
diff --git a/pv/binding/device.hpp b/pv/binding/device.hpp
index 2a4c516..aceac8c 100644
--- a/pv/binding/device.hpp
+++ b/pv/binding/device.hpp
@@ -14,12 +14,13 @@
* 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 .
*/
-#ifndef PULSEVIEW_PV_BINDING_DEVICE_H
-#define PULSEVIEW_PV_BINDING_DEVICE_H
+#ifndef PULSEVIEW_PV_BINDING_DEVICE_HPP
+#define PULSEVIEW_PV_BINDING_DEVICE_HPP
+
+#include
#include
@@ -30,9 +31,12 @@
#include
-namespace sigrok {
- class Configurable;
-}
+#include
+
+using std::function;
+using std::pair;
+using std::set;
+using std::shared_ptr;
namespace pv {
@@ -43,30 +47,33 @@ class Device : public QObject, public Binding
Q_OBJECT
public:
- Device(std::shared_ptr configurable);
+ Device(shared_ptr configurable);
Q_SIGNALS:
void config_changed();
private:
- void bind_bool(const QString &name,
+ void bind_bool(const QString &name, const QString &desc,
prop::Property::Getter getter, prop::Property::Setter setter);
- void bind_enum(const QString &name, Glib::VariantContainerBase gvar_list,
+ void bind_enum(const QString &name, const QString &desc,
+ const sigrok::ConfigKey *key,
+ set capabilities,
prop::Property::Getter getter, prop::Property::Setter setter,
- std::function printer = print_gvariant);
- void bind_int(const QString &name, QString suffix,
- boost::optional< std::pair > range,
+ function printer = print_gvariant);
+ void bind_int(const QString &name, const QString &desc, QString suffix,
+ boost::optional< pair > range,
prop::Property::Getter getter, prop::Property::Setter setter);
static QString print_timebase(Glib::VariantBase gvar);
static QString print_vdiv(Glib::VariantBase gvar);
static QString print_voltage_threshold(Glib::VariantBase gvar);
+ static QString print_probe_factor(Glib::VariantBase gvar);
protected:
- std::shared_ptr configurable_;
+ shared_ptr configurable_;
};
-} // binding
-} // pv
+} // namespace binding
+} // namespace pv
-#endif // PULSEVIEW_PV_BINDING_DEVICE_H
+#endif // PULSEVIEW_PV_BINDING_DEVICE_HPP