X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fprop%2Fdouble.cpp;h=e1539a127d63dccd9830673a21d66bd07e343f69;hb=d13d95b3eaee713cc4eabbc0682ca545b4c31800;hp=d7c79ca7db19ce6481d3b8293c06848fcd5364d0;hpb=9f6af8bd3a6bc12f9b32b91cd2a173a8a7763f5c;p=pulseview.git
diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index d7c79ca..e1539a1 100644
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -14,67 +14,84 @@
* 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 .
*/
-#include
+#include
#include
-#include "double.h"
+#include "double.hpp"
-using namespace std;
-using namespace boost;
+using boost::optional;
+using std::pair;
namespace pv {
namespace prop {
Double::Double(QString name,
+ QString desc,
int decimals,
QString suffix,
optional< pair > range,
optional step,
- function getter,
- function setter) :
- Property(name),
- _decimals(decimals),
- _suffix(suffix),
- _range(range),
- _step(step),
- _getter(getter),
- _setter(setter),
- _spin_box(NULL)
+ Getter getter,
+ Setter setter) :
+ Property(name, desc, 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;
+ 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);
+ if (!getter_)
+ return nullptr;
- _spin_box->setValue(_getter ? _getter() : 0.0);
+ Glib::VariantBase variant = getter_();
+ if (!variant.gobj())
+ return nullptr;
- return _spin_box;
+ double value = Glib::VariantBase::cast_dynamic>(
+ 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::create(spin_box_->value()));
+}
+
+void Double::on_value_changed(double)
+{
+ commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv