Merge lp:~marcustomlinson/unity-js-scopes/filters into lp:unity-js-scopes

[Marcus Tomlinson]

Added filters support

Unmerged revisions

150. By Marcus Tomlinson on 2016-05-12

ValueSliderFilter complete

149. By Marcus Tomlinson on 2016-05-12

RangeInputFilter complete

148. By Marcus Tomlinson on 2016-05-12

FilterGroup complete

147. By Marcus Tomlinson on 2016-05-12

ValueSliderLabels complete

146. By Marcus Tomlinson on 2016-05-12

Fix ValueSliderLabels

145. By Marcus Tomlinson on 2016-05-12

Fix ValueSliderFilter

144. By Marcus Tomlinson on 2016-05-12

Fix RangeInputFilter

143. By Marcus Tomlinson on 2016-05-12

Minimal classes to build

=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2016-02-25 13:48:52 +0000
+++ src/bindings/src/addon.cc	2016-05-12 12:10:04 +0000
@@ -37,11 +37,13 @@
 #include "canned-query.h"
 #include "categorised-result.h"
 #include "department.h"
+#include "filter-group.h"
 #include "online-account-client.h"
 #include "option-selector-filter.h"
 #include "preview-query.h"
 #include "preview-reply.h"
 #include "preview-widget.h"
+#include "range-input-filter.h"
 #include "scope-base.h"
 #include "scope.h"
 #include "search-query.h"
@@ -49,6 +51,8 @@
 #include "search-metadata.h"
 #include "registry.h"
 #include "result.h"
+#include "value-slider-filter.h"
+#include "value-slider-labels.h"
 #include "variant.h"
 
 // TODO static
@@ -456,6 +460,61 @@
       .add_member("token_secret", &unity::scopes::OnlineAccountClient::ServiceStatus::token_secret)
       .add_member("error", &unity::scopes::OnlineAccountClient::ServiceStatus::error);
 
+    v8cpp::Class<FilterGroup> filter_group(isolate);
+    filter_group
+      .set_constructor<std::string, std::string>()
+      .add_method("id", &FilterGroup::id)
+      .add_method("label", &FilterGroup::label);
+
+    v8cpp::Class<RangeInputFilter> range_input_filter(isolate);
+    range_input_filter
+      .set_constructor<v8::FunctionCallbackInfo<v8::Value>>()
+      .add_method("set_display_hints", &RangeInputFilter::set_display_hints)
+      .add_method("display_hints", &RangeInputFilter::display_hints)
+      .add_method("id", &RangeInputFilter::id)
+      .add_method("filter_type", &RangeInputFilter::filter_type)
+      .add_method("set_title", &RangeInputFilter::set_title)
+      .add_method("title", &RangeInputFilter::title)
+      .add_method("filter_group", &RangeInputFilter::filter_group)
+      .add_method("start_prefix_label", &RangeInputFilter::start_prefix_label)
+      .add_method("start_postfix_label", &RangeInputFilter::start_postfix_label)
+      .add_method("end_prefix_label", &RangeInputFilter::end_prefix_label)
+      .add_method("end_postfix_label", &RangeInputFilter::end_postfix_label)
+      .add_method("central_label", &RangeInputFilter::central_label)
+      .add_method("default_start_value", &RangeInputFilter::default_start_value)
+      .add_method("default_end_value", &RangeInputFilter::default_end_value)
+      .add_method("has_start_value", &RangeInputFilter::has_start_value)
+      .add_method("has_end_value", &RangeInputFilter::has_end_value)
+      .add_method("start_value", &RangeInputFilter::start_value)
+      .add_method("end_value", &RangeInputFilter::end_value)
+      .add_method("update_state", &RangeInputFilter::update_state);
+
+    v8cpp::Class<ValueSliderFilter> value_slider_filter(isolate);
+    value_slider_filter
+      .set_constructor<v8::FunctionCallbackInfo<v8::Value>>()
+      .add_method("set_display_hints", &ValueSliderFilter::set_display_hints)
+      .add_method("display_hints", &ValueSliderFilter::display_hints)
+      .add_method("id", &ValueSliderFilter::id)
+      .add_method("filter_type", &ValueSliderFilter::filter_type)
+      .add_method("set_title", &ValueSliderFilter::set_title)
+      .add_method("title", &ValueSliderFilter::title)
+      .add_method("filter_group", &ValueSliderFilter::filter_group)
+      .add_method("set_default_value", &ValueSliderFilter::set_default_value)
+      .add_method("default_value", &ValueSliderFilter::default_value)
+      .add_method("min", &ValueSliderFilter::min)
+      .add_method("max", &ValueSliderFilter::max)
+      .add_method("has_value", &ValueSliderFilter::has_value)
+      .add_method("value", &ValueSliderFilter::value)
+      .add_method("labels", &ValueSliderFilter::labels)
+      .add_method("update_state", &ValueSliderFilter::update_state);
+
+    v8cpp::Class<ValueSliderLabels> value_slider_labels(isolate);
+    value_slider_labels
+      .set_constructor<v8::FunctionCallbackInfo<v8::Value>>()
+      .add_method("min_label", &ValueSliderLabels::min_label)
+      .add_method("max_label", &ValueSliderLabels::max_label)
+      .add_method("extra_labels", &ValueSliderLabels::extra_labels);
+
     v8cpp::Module module(isolate);
     module.add_class("js_scope", js_scope);
     module.add_class("scope_base", scope_base);
@@ -468,6 +527,7 @@
     module.add_class("CategoryRenderer", category_renderer);
     module.add_class("ColumnLayout", column_layout);
     module.add_class("Department", department);
+    module.add_class("FilterGroup", filter_group);
     module.add_class("FilterOption", filter_option);
     module.add_class("FilterState", filter_state);
     module.add_class("Location", location);
@@ -478,12 +538,15 @@
     module.add_class("PreviewWidget", preview_widget);
     module.add_class("PreviewQuery", preview_query);
     module.add_class("PreviewReply", preview_reply);
+    module.add_class("RangeInputFilter", range_input_filter);
     module.add_class("Registry", registry);
     module.add_class("Result", result);
     module.add_class("ScopeMetadata", scope_metadata);
     module.add_class("SearchReply", search_reply);
     module.add_class("SearchQuery", search_query);
     module.add_class("SearchMetadata", search_metadata);
+    module.add_class("ValueSliderFilter", value_slider_filter);
+    module.add_class("ValueSliderLabels", value_slider_labels);
     module.add_class("Variant", variant);
     module.add_class("VariantBase", variant_base);
 
 
=== added file 'src/bindings/src/filter-group.cc'
--- src/bindings/src/filter-group.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/filter-group.cc	2016-05-12 12:10:04 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "filter-group.h"
+
+
+FilterGroup::FilterGroup(std::string const& id, std::string const& label)
+    : filter_group_(unity::scopes::FilterGroup::create(id, label)){
+}
+
+std::string FilterGroup::id() const
+{
+    return filter_group_->id();
+}
+
+std::string FilterGroup::label() const
+{
+    return filter_group_->label();
+}
+
+unity::scopes::FilterGroup::SCPtr FilterGroup::get_filter_group() const
+{
+    return filter_group_;
+}
 
=== added file 'src/bindings/src/filter-group.h'
--- src/bindings/src/filter-group.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/filter-group.h	2016-05-12 12:10:04 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UNITY_JS_FILTER_GROUP_H_
+#define _UNITY_JS_FILTER_GROUP_H_
+
+#include <unity/scopes/FilterGroup.h>
+
+class FilterGroup
+{
+public:
+    FilterGroup(std::string const& id, std::string const& label);
+
+    std::string id() const;
+    std::string label() const;
+
+    unity::scopes::FilterGroup::SCPtr get_filter_group() const;
+
+private:
+    unity::scopes::FilterGroup::SCPtr filter_group_;
+};
+
+#endif // _UNITY_JS_FILTER_GROUP_H_
+
+
 
=== added file 'src/bindings/src/range-input-filter.cc'
--- src/bindings/src/range-input-filter.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/range-input-filter.cc	2016-05-12 12:10:04 +0000
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "common.h"
+#include "range-input-filter.h"
+
+RangeInputFilter::RangeInputFilter(v8::FunctionCallbackInfo<v8::Value> const& args)
+{
+    if (args.Length() == 6)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = v8cpp::from_v8<std::string>(args.GetIsolate(), args[1]);
+        auto c = v8cpp::from_v8<std::string>(args.GetIsolate(), args[2]);
+        auto d = v8cpp::from_v8<std::string>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::string>(args.GetIsolate(), args[4]);
+        auto f = v8cpp::from_v8<std::string>(args.GetIsolate(), args[5]);
+
+        filter_ = unity::scopes::RangeInputFilter::create(a, b, c, d, e, f);
+    }
+    else if (args.Length() == 7)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = v8cpp::from_v8<std::string>(args.GetIsolate(), args[1]);
+        auto c = v8cpp::from_v8<std::string>(args.GetIsolate(), args[2]);
+        auto d = v8cpp::from_v8<std::string>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::string>(args.GetIsolate(), args[4]);
+        auto f = v8cpp::from_v8<std::string>(args.GetIsolate(), args[5]);
+        auto g = v8cpp::from_v8<std::shared_ptr<FilterGroup>>(args.GetIsolate(), args[6]);
+
+        filter_ = unity::scopes::RangeInputFilter::create(a, b, c, d, e, f, g->get_filter_group());
+        filter_group_ = g;
+    }
+    else if (args.Length() == 8)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = unity::scopesjs::to_variant(args[1]);
+        auto c = unity::scopesjs::to_variant(args[2]);
+        auto d = v8cpp::from_v8<std::string>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::string>(args.GetIsolate(), args[4]);
+        auto f = v8cpp::from_v8<std::string>(args.GetIsolate(), args[5]);
+        auto g = v8cpp::from_v8<std::string>(args.GetIsolate(), args[6]);
+        auto h = v8cpp::from_v8<std::string>(args.GetIsolate(), args[7]);
+
+        filter_ = unity::scopes::RangeInputFilter::create(a, b, c, d, e, f, g, h);
+    }
+    else if (args.Length() == 9)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = unity::scopesjs::to_variant(args[1]);
+        auto c = unity::scopesjs::to_variant(args[2]);
+        auto d = v8cpp::from_v8<std::string>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::string>(args.GetIsolate(), args[4]);
+        auto f = v8cpp::from_v8<std::string>(args.GetIsolate(), args[5]);
+        auto g = v8cpp::from_v8<std::string>(args.GetIsolate(), args[6]);
+        auto h = v8cpp::from_v8<std::string>(args.GetIsolate(), args[7]);
+        auto i = v8cpp::from_v8<std::shared_ptr<FilterGroup>>(args.GetIsolate(), args[8]);
+
+        filter_ = unity::scopes::RangeInputFilter::create(a, b, c, d, e, f, g, h, i->get_filter_group());
+        filter_group_ = i;
+    }
+    else
+    {
+        throw std::runtime_error("Invalid number of arguments");
+    }
+}
+
+void RangeInputFilter::set_display_hints(int hints)
+{
+    filter_->set_display_hints(hints);
+}
+
+int RangeInputFilter::display_hints() const
+{
+    return filter_->display_hints();
+}
+
+std::string RangeInputFilter::id() const
+{
+    return filter_->id();
+}
+
+std::string RangeInputFilter::filter_type() const
+{
+    return filter_->filter_type();
+}
+
+void RangeInputFilter::set_title(std::string const& title)
+{
+    filter_->set_title(title);
+}
+
+std::string RangeInputFilter::title() const
+{
+    return filter_->title();
+}
+
+std::shared_ptr<FilterGroup> RangeInputFilter::filter_group() const
+{
+    return filter_group_;
+}
+
+std::string RangeInputFilter::start_prefix_label() const
+{
+    return filter_->start_prefix_label();
+}
+
+std::string RangeInputFilter::start_postfix_label() const
+{
+    return filter_->start_postfix_label();
+}
+
+std::string RangeInputFilter::end_prefix_label() const
+{
+    return filter_->end_prefix_label();
+}
+
+std::string RangeInputFilter::end_postfix_label() const
+{
+    return filter_->end_postfix_label();
+}
+
+std::string RangeInputFilter::central_label() const
+{
+    return filter_->central_label();
+}
+
+unity::scopes::Variant RangeInputFilter::default_start_value() const
+{
+    return filter_->default_start_value();
+}
+
+unity::scopes::Variant RangeInputFilter::default_end_value() const
+{
+    return filter_->default_end_value();
+}
+
+bool RangeInputFilter::has_start_value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->has_start_value(filter_state);
+}
+
+bool RangeInputFilter::has_end_value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->has_end_value(filter_state);
+}
+
+double RangeInputFilter::start_value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->start_value(filter_state);
+}
+
+double RangeInputFilter::end_value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->end_value(filter_state);
+}
+
+void RangeInputFilter::update_state(unity::scopes::FilterState& filter_state, unity::scopes::Variant const& start_value, unity::scopes::Variant const& end_value) const
+{
+    return filter_->update_state(filter_state, start_value, end_value);
+}
+
+unity::scopes::RangeInputFilter::SPtr RangeInputFilter::get_filter()
+{
+    return filter_;
+}
 
=== added file 'src/bindings/src/range-input-filter.h'
--- src/bindings/src/range-input-filter.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/range-input-filter.h	2016-05-12 12:10:04 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UNITY_JS_RANGE_INPUT_FILTER_H_
+#define _UNITY_JS_RANGE_INPUT_FILTER_H_
+
+#include "filter-group.h"
+
+#include <unity/scopes/RangeInputFilter.h>
+
+#include <v8-cpp.h>
+
+class RangeInputFilter
+{
+public:
+    RangeInputFilter(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+    // FilterBase
+    void set_display_hints(int hints);
+    int display_hints() const;
+    std::string id() const;
+    std::string filter_type() const;
+    void set_title(std::string const& title);
+    std::string title() const;
+    std::shared_ptr<FilterGroup> filter_group() const;
+
+    // RangeInputFilter
+    std::string start_prefix_label() const;
+    std::string start_postfix_label() const;
+    std::string end_prefix_label() const;
+    std::string end_postfix_label() const;
+    std::string central_label() const;
+    unity::scopes::Variant default_start_value() const;
+    unity::scopes::Variant default_end_value() const;
+    bool has_start_value(unity::scopes::FilterState const& filter_state) const;
+    bool has_end_value(unity::scopes::FilterState const& filter_state) const;
+    double start_value(unity::scopes::FilterState const& filter_state) const;
+    double end_value(unity::scopes::FilterState const& filter_state) const;
+    void update_state(unity::scopes::FilterState& filter_state, unity::scopes::Variant const& start_value, unity::scopes::Variant const& end_value) const;
+
+    unity::scopes::RangeInputFilter::SPtr get_filter();
+
+private:
+    unity::scopes::RangeInputFilter::SPtr filter_;
+    std::shared_ptr<FilterGroup> filter_group_;
+};
+
+#endif // _UNITY_JS_RANGE_INPUT_FILTER_H_
+
+
 
=== modified file 'src/bindings/src/search-reply.cc'
--- src/bindings/src/search-reply.cc	2015-11-08 15:49:12 +0000
+++ src/bindings/src/search-reply.cc	2016-05-12 12:10:04 +0000
@@ -20,6 +20,8 @@
 
 #include "categorised-result.h"
 #include "option-selector-filter.h"
+#include "range-input-filter.h"
+#include "value-slider-filter.h"
 
 #include <stdexcept>
 
@@ -42,6 +44,14 @@
       auto f = v8cpp::from_v8<std::shared_ptr<OptionSelectorFilter>>(isolate, fv);
       filter_bases.push_back(f->get_filter());
     } catch(...) { }
+    try {
+      auto f = v8cpp::from_v8<std::shared_ptr<RangeInputFilter>>(isolate, fv);
+      filter_bases.push_back(f->get_filter());
+    } catch(...) { }
+    try {
+      auto f = v8cpp::from_v8<std::shared_ptr<ValueSliderFilter>>(isolate, fv);
+      filter_bases.push_back(f->get_filter());
+    } catch(...) { }
   }
   return filter_bases;
 }
 
=== added file 'src/bindings/src/value-slider-filter.cc'
--- src/bindings/src/value-slider-filter.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/value-slider-filter.cc	2016-05-12 12:10:04 +0000
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "value-slider-filter.h"
+
+ValueSliderFilter::ValueSliderFilter(v8::FunctionCallbackInfo<v8::Value> const& args)
+{
+    if (args.Length() == 5)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = v8cpp::from_v8<double>(args.GetIsolate(), args[1]);
+        auto c = v8cpp::from_v8<double>(args.GetIsolate(), args[2]);
+        auto d = v8cpp::from_v8<double>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::shared_ptr<ValueSliderLabels>>(args.GetIsolate(), args[4]);
+
+        filter_ = unity::scopes::ValueSliderFilter::create(a, b, c, d, e->get_labels());
+        labels_ = e;
+    }
+    else if (args.Length() == 6)
+    {
+        auto a = v8cpp::from_v8<std::string>(args.GetIsolate(), args[0]);
+        auto b = v8cpp::from_v8<double>(args.GetIsolate(), args[1]);
+        auto c = v8cpp::from_v8<double>(args.GetIsolate(), args[2]);
+        auto d = v8cpp::from_v8<double>(args.GetIsolate(), args[3]);
+        auto e = v8cpp::from_v8<std::shared_ptr<ValueSliderLabels>>(args.GetIsolate(), args[4]);
+        auto f = v8cpp::from_v8<std::shared_ptr<FilterGroup>>(args.GetIsolate(), args[5]);
+
+        filter_ = unity::scopes::ValueSliderFilter::create(a, b, c, d, e->get_labels(), f->get_filter_group());
+        labels_ = e;
+        filter_group_ = f;
+    }
+    else
+    {
+        throw std::runtime_error("Invalid number of arguments");
+    }
+}
+
+void ValueSliderFilter::set_display_hints(int hints)
+{
+    filter_->set_display_hints(hints);
+}
+
+int ValueSliderFilter::display_hints() const
+{
+    return filter_->display_hints();
+}
+
+std::string ValueSliderFilter::id() const
+{
+    return filter_->id();
+}
+
+std::string ValueSliderFilter::filter_type() const
+{
+    return filter_->filter_type();
+}
+
+void ValueSliderFilter::set_title(std::string const& title)
+{
+    return filter_->set_title(title);
+}
+
+std::string ValueSliderFilter::title() const
+{
+    return filter_->title();
+}
+
+std::shared_ptr<FilterGroup> ValueSliderFilter::filter_group() const
+{
+    return filter_group_;
+}
+
+void ValueSliderFilter::set_default_value(double val)
+{
+    return filter_->set_default_value(val);
+}
+
+double ValueSliderFilter::default_value() const
+{
+    return filter_->default_value();
+}
+
+double ValueSliderFilter::min() const
+{
+    return filter_->min();
+}
+
+double ValueSliderFilter::max() const
+{
+    return filter_->max();
+}
+
+bool ValueSliderFilter::has_value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->has_value(filter_state);
+}
+
+double ValueSliderFilter::value(unity::scopes::FilterState const& filter_state) const
+{
+    return filter_->value(filter_state);
+}
+
+std::shared_ptr<ValueSliderLabels> ValueSliderFilter::labels() const
+{
+    return labels_;
+}
+
+void ValueSliderFilter::update_state(unity::scopes::FilterState& filter_state, double value) const
+{
+    return filter_->update_state(filter_state, value);
+}
+
+unity::scopes::ValueSliderFilter::SPtr ValueSliderFilter::get_filter()
+{
+    return filter_;
+}
 
=== added file 'src/bindings/src/value-slider-filter.h'
--- src/bindings/src/value-slider-filter.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/value-slider-filter.h	2016-05-12 12:10:04 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UNITY_JS_VALUE_SLIDER_FILTER_H_
+#define _UNITY_JS_VALUE_SLIDER_FILTER_H_
+
+#include "value-slider-labels.h"
+#include "filter-group.h"
+
+#include <unity/scopes/ValueSliderFilter.h>
+
+class ValueSliderFilter
+{
+public:
+    ValueSliderFilter(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+    // FilterBase
+    void set_display_hints(int hints);
+    int display_hints() const;
+    std::string id() const;
+    std::string filter_type() const;
+    void set_title(std::string const& title);
+    std::string title() const;
+    std::shared_ptr<FilterGroup> filter_group() const;
+
+    // ValueSliderFilter
+    void set_default_value(double val);
+    double default_value() const;
+    double min() const;
+    double max() const;
+    bool has_value(unity::scopes::FilterState const& filter_state) const;
+    double value(unity::scopes::FilterState const& filter_state) const;
+    std::shared_ptr<ValueSliderLabels> labels() const;
+    void update_state(unity::scopes::FilterState& filter_state, double value) const;
+
+    unity::scopes::ValueSliderFilter::SPtr get_filter();
+
+private:
+    unity::scopes::ValueSliderFilter::SPtr filter_;
+    std::shared_ptr<FilterGroup> filter_group_;
+    std::shared_ptr<ValueSliderLabels> labels_;
+};
+
+#endif // _UNITY_JS_VALUE_SLIDER_FILTER_H_
+
+
 
=== added file 'src/bindings/src/value-slider-labels.cc'
--- src/bindings/src/value-slider-labels.cc	1970-01-01 00:00:00 +0000
+++ src/bindings/src/value-slider-labels.cc	2016-05-12 12:10:04 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "value-slider-labels.h"
+
+#include "common.h"
+
+//std::string const& min_label, std::string const& max_label, ValueLabelPairList const& extra_labels
+
+ValueSliderLabels::ValueSliderLabels(v8::FunctionCallbackInfo<v8::Value> const& args)
+{
+    if (args.Length() != 2 && args.Length() != 3) {
+      throw std::runtime_error("Invalid number of arguments");
+    }
+    if (!args[0]->IsString()) {
+      throw std::runtime_error("Invalid argument type");
+    }
+    if (!args[1]->IsString()) {
+      throw std::runtime_error("Invalid argument type");
+    }
+
+    std::string min_label =
+      *(v8::String::Utf8Value(args[0]->ToString()));
+
+    std::string max_label =
+      *(v8::String::Utf8Value(args[1]->ToString()));
+
+    if (args.Length() == 3)
+    {
+        ValueLabelPairList extra_labels;
+
+        try
+        {
+            auto extra_labels_a = unity::scopesjs::to_variant(args[2]).get_array();
+
+            for (auto const& label : extra_labels_a)
+            {
+                auto label_pair = label.get_array();
+                if (label_pair.size() == 2)
+                {
+                    extra_labels.push_back(ValueLabelPair(label_pair[0].get_double(), label_pair[1].get_string()));
+                }
+            }
+        } catch(...)
+        {
+            throw std::runtime_error("ValueSliderLabels::ValueSliderLabels: Malformed 'extra_labels' argument! Expected format: [[2, \"2\"], [4, \"4\"]]");
+        }
+
+        labels_ = std::make_shared<unity::scopes::ValueSliderLabels>(unity::scopes::ValueSliderLabels(min_label, max_label, extra_labels));
+    }
+    else
+    {
+        labels_ = std::make_shared<unity::scopes::ValueSliderLabels>(unity::scopes::ValueSliderLabels(min_label, max_label));
+    }
+}
+
+std::string ValueSliderLabels::min_label() const
+{
+    return labels_->min_label();
+}
+
+std::string ValueSliderLabels::max_label() const
+{
+    return labels_->max_label();
+}
+
+ValueLabelPairList ValueSliderLabels::extra_labels() const
+{
+    return labels_->extra_labels();
+}
+
+unity::scopes::ValueSliderLabels ValueSliderLabels::get_labels() const
+{
+    return *labels_;
+}
 
=== added file 'src/bindings/src/value-slider-labels.h'
--- src/bindings/src/value-slider-labels.h	1970-01-01 00:00:00 +0000
+++ src/bindings/src/value-slider-labels.h	2016-05-12 12:10:04 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This file is part of unity-js-scopes.
+ *
+ * unity-js-scopes 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; version 3.
+ *
+ * unity-js-scopes 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _UNITY_JS_VALUE_SLIDER_LABELS_H_
+#define _UNITY_JS_VALUE_SLIDER_LABELS_H_
+
+#include <unity/scopes/ValueSliderLabels.h>
+
+#include <v8-cpp.h>
+
+typedef std::pair<double, std::string> ValueLabelPair;
+typedef std::vector<ValueLabelPair> ValueLabelPairList;
+
+class ValueSliderLabels
+{
+public:
+    ValueSliderLabels(v8::FunctionCallbackInfo<v8::Value> const& args);
+
+    std::string min_label() const;
+    std::string max_label() const;
+    ValueLabelPairList extra_labels() const;
+
+    unity::scopes::ValueSliderLabels get_labels() const;
+
+private:
+    std::shared_ptr<unity::scopes::ValueSliderLabels> labels_;
+};
+
+#endif // _UNITY_JS_VALUE_SLIDER_LABELS_H_
+
+