Build fixes for Qt5 Windows/mingw/MXE support.

[pulseview.git] / pv / prop / double.cpp

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index fdd9a44c06828ff64cf44d67a1b29e4b18268b99..f453cf178a7fb3e8034022f6d575e667dd3d2575 100644 (file)
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -14,18 +14,17 @@
  * 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 <assert.h>
 
 #include <QDoubleSpinBox>
 
-#include "double.h"
+#include "double.hpp"
 
-using namespace std;
-using namespace boost;
+using boost::optional;
+using std::pair;
 
 namespace pv {
 namespace prop {
@@ -35,43 +34,62 @@ Double::Double(QString name,
        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)
+       Getter getter,
+       Setter setter) :
+       Property(name, getter, setter),
+       decimals_(decimals),
+       suffix_(suffix),
+       range_(range),
+       step_(step),
+       spin_box_(nullptr)
 {
 }
 
-QWidget* Double::get_widget(QWidget *parent)
+QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 {
-       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;
+       if (spin_box_)
+               return spin_box_;
+
+       if (!getter_)
+               return nullptr;
+
+       Glib::VariantBase variant = getter_();
+       if (!variant.gobj())
+               return nullptr;
+
+       double value = Glib::VariantBase::cast_dynamic<Glib::Variant<double>>(
+               variant).get();
+
+       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_);
+
+       spin_box_->setValue(value);
+
+       if (auto_commit)
+               connect(spin_box_, SIGNAL(valueChanged(double)),
+                       this, SLOT(on_value_changed(double)));
+
+       return spin_box_;
 }
 
 void Double::commit()
 {
-       assert(_setter);
+       assert(setter_);
 
-       if(!_spin_box)
+       if (!spin_box_)
                return;
 
-       _setter(_spin_box->value());
+       setter_(Glib::Variant<double>::create(spin_box_->value()));
+}
+
+void Double::on_value_changed(double)
+{
+       commit();
 }
 
 } // prop