Added a Double property object

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 722b764c26b6cc09ccc8867e601c934426ede6b7..8d093be764d396efcdbd01847b80cacf0d2d6582 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,6 +101,7 @@ set(pulseview_SOURCES
        pv/data/snapshot.cpp
        pv/dialogs/about.cpp
        pv/dialogs/deviceoptions.cpp
+       pv/prop/double.cpp
        pv/prop/enum.cpp
        pv/prop/property.cpp
        pv/prop/binding/binding.cpp

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
new file mode 100644 (file)
index 0000000..fdd9a44
--- /dev/null
+++ b/pv/prop/double.cpp
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#include <assert.h>
+
+#include <QDoubleSpinBox>
+
+#include "double.h"
+
+using namespace std;
+using namespace boost;
+
+namespace pv {
+namespace prop {
+
+Double::Double(QString name,
+       int decimals,
+       QString suffix,
+       optional< pair<double, double> > range,
+       optional<double> step,
+       function<double ()> getter,
+       function<void (double)> setter) :
+       Property(name),
+       _decimals(decimals),
+       _suffix(suffix),
+       _range(range),
+       _step(step),
+       _getter(getter),
+       _setter(setter),
+       _spin_box(NULL)
+{
+}
+
+QWidget* Double::get_widget(QWidget *parent)
+{
+       if(_spin_box)
+               return _spin_box;
+
+       _spin_box = new QDoubleSpinBox(parent);
+       _spin_box->setDecimals(_decimals);
+       _spin_box->setSuffix(_suffix);
+       if(_range)
+               _spin_box->setRange(_range->first, _range->second);
+       if(_step)
+               _spin_box->setSingleStep(*_step);
+
+       return _spin_box;
+}
+
+void Double::commit()
+{
+       assert(_setter);
+
+       if(!_spin_box)
+               return;
+
+       _setter(_spin_box->value());
+}
+
+} // prop
+} // pv

diff --git a/pv/prop/double.h b/pv/prop/double.h
new file mode 100644 (file)
index 0000000..19cbe2c
--- /dev/null
+++ b/pv/prop/double.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#ifndef PULSEVIEW_PV_PROP_DOUBLE_H
+#define PULSEVIEW_PV_PROP_DOUBLE_H
+
+#include <utility>
+#include <vector>
+
+#include <boost/optional.hpp>
+
+#include "property.h"
+
+class QDoubleSpinBox;
+
+namespace pv {
+namespace prop {
+
+class Double : public Property
+{
+public:
+       Double(QString name, int decimals, QString suffix,
+               boost::optional< std::pair<double, double> > range,
+               boost::optional<double> step,
+               boost::function<double ()> getter,
+               boost::function<void (double)> setter);
+
+       QWidget* get_widget(QWidget *parent);
+
+       void commit();
+
+private:
+       const int _decimals;
+       const QString _suffix;
+       const boost::optional< std::pair<double, double> > _range;
+       const boost::optional<double> _step;
+       boost::function<double ()> _getter;
+       boost::function<void (double)> _setter;
+
+       QDoubleSpinBox *_spin_box;
+};
+
+} // prop
+} // pv
+
+#endif // PULSEVIEW_PV_PROP_DOUBLE_H