Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor + Standardize Selection State Representation #4068

Merged
merged 14 commits into from
Oct 13, 2018
Merged

Refactor + Standardize Selection State Representation #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bfc97d0
Simplify selection project transform.
arvind Jul 21, 2018
528c65c
Add new top-level signal to define structure of selection tuples.
arvind Jul 21, 2018
9da4916
Simplify single/multi selection tuple definition.
arvind Jul 21, 2018
70e5efe
Align interval selection tuples with single/multi.
arvind Jul 21, 2018
666bf7b
Differentiate between inclusive/exclusive ranges.
arvind Jul 21, 2018
94421e6
Use a standard predicate test expr function for all selection types.
arvind Jul 21, 2018
93c8091
Store field defs on selection tuple rather than a top-level signal.
arvind Jul 21, 2018
ddbe1b7
Update inputs selection transform to new tuple structure.
arvind Jul 21, 2018
98a2b12
Add a top-level signal for reading a selection's resolved values.
arvind Jul 21, 2018
605f1cf
Update scale bindings to use the new top-level selection signal.
arvind Jul 21, 2018
ea88efb
Update runtime tests to new store structure.
arvind Aug 19, 2018
366f8c9
Replace forEach with for, remove as, remove push.apply, add test, and…
domoritz Oct 13, 2018
97772d5
[Travis] Update examples (build: 19319)
Oct 13, 2018
6745760
[Travis] Auto-formatting (build: 19319)
Oct 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions examples/compiled/circle_bubble_health_income.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
},
{"name": "view", "update": "vlSelectionResolve(\"view_store\")"},
{
"name": "view_income",
"on": [
Expand Down Expand Up @@ -60,10 +61,14 @@
"on": [
{
"events": [{"signal": "view_income"}, {"signal": "view_health"}],
"update": "view_income && view_health ? {unit: \"\", intervals: [{encoding: \"x\", field: \"income\", extent: view_income}, {encoding: \"y\", field: \"health\", extent: view_health}]} : null"
"update": "view_income && view_health ? {unit: \"\", fields: view_tuple_fields, values: [view_income, view_health]} : null"
}
]
},
{
"name": "view_tuple_fields",
"update": "[{\"field\":\"income\",\"channel\":\"x\",\"type\":\"R\"},{\"field\":\"health\",\"channel\":\"y\",\"type\":\"R\"}]"
},
{
"name": "view_translate_anchor",
"value": {},
Expand Down Expand Up @@ -156,15 +161,15 @@
"name": "x",
"type": "log",
"domain": {"data": "source_0", "field": "income"},
"domainRaw": {"signal": "view_income"},
"domainRaw": {"signal": "view[\"income\"]"},
"range": [0, {"signal": "width"}],
"nice": true
},
{
"name": "y",
"type": "linear",
"domain": {"data": "source_0", "field": "health"},
"domainRaw": {"signal": "view_health"},
"domainRaw": {"signal": "view[\"health\"]"},
"range": [{"signal": "height"}, 0],
"zero": false,
"nice": true
Expand Down
15 changes: 8 additions & 7 deletions examples/compiled/concat_bar_layer_circle.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
},
{
"type": "filter",
"expr": "!(length(data(\"pts_store\"))) || (vlSingle(\"pts_store\", datum))"
"expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
},
{
"type": "aggregate",
Expand Down Expand Up @@ -160,10 +160,7 @@
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
},
{
"name": "pts",
"update": "data(\"pts_store\").length && {Major_Genre: data(\"pts_store\")[0].values[0]}"
}
{"name": "pts", "update": "vlSelectionResolve(\"pts_store\")"}
],
"layout": {
"padding": {"row": 10, "column": 10},
Expand Down Expand Up @@ -315,11 +312,15 @@
"on": [
{
"events": [{"source": "scope", "type": "click"}],
"update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", encodings: [\"x\"], fields: [\"Major_Genre\"], values: [datum[\"Major_Genre\"]]} : null",
"update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", fields: pts_tuple_fields, values: [datum[\"Major_Genre\"]]} : null",
"force": true
}
]
},
{
"name": "pts_tuple_fields",
"update": "[{\"field\":\"Major_Genre\",\"channel\":\"x\",\"type\":\"E\"}]"
},
{
"name": "pts_modify",
"on": [
Expand All @@ -344,7 +345,7 @@
"value": null
},
{
"test": "!(length(data(\"pts_store\"))) || (vlSingle(\"pts_store\", datum))",
"test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
"value": "steelblue"
},
{"value": "grey"}
Expand Down
9 changes: 7 additions & 2 deletions examples/compiled/interactive_area_brush.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"transform": [
{
"type": "filter",
"expr": "!(length(data(\"brush_store\"))) || (vlInterval(\"brush_store\", datum))"
"expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
},
{
"type": "formula",
Expand All @@ -61,6 +61,7 @@
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
},
{"name": "brush", "update": "vlSelectionResolve(\"brush_store\")"},
{
"name": "brush_x",
"value": [],
Expand Down Expand Up @@ -125,10 +126,14 @@
"on": [
{
"events": [{"signal": "brush_yearmonth_date"}],
"update": "brush_yearmonth_date ? {unit: \"layer_0\", intervals: [{encoding: \"x\", field: \"yearmonth_date\", extent: brush_yearmonth_date}]} : null"
"update": "brush_yearmonth_date ? {unit: \"layer_0\", fields: brush_tuple_fields, values: [brush_yearmonth_date]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"yearmonth_date\",\"channel\":\"x\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down
9 changes: 7 additions & 2 deletions examples/compiled/interactive_brush.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
},
{"name": "brush", "update": "vlSelectionResolve(\"brush_store\")"},
{
"name": "brush_x",
"value": [],
Expand Down Expand Up @@ -147,10 +148,14 @@
{"signal": "brush_Horsepower"},
{"signal": "brush_Miles_per_Gallon"}
],
"update": "brush_Horsepower && brush_Miles_per_Gallon ? {unit: \"\", intervals: [{encoding: \"x\", field: \"Horsepower\", extent: brush_Horsepower}, {encoding: \"y\", field: \"Miles_per_Gallon\", extent: brush_Miles_per_Gallon}]} : null"
"update": "brush_Horsepower && brush_Miles_per_Gallon ? {unit: \"\", fields: brush_tuple_fields, values: [brush_Horsepower, brush_Miles_per_Gallon]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"Horsepower\",\"channel\":\"x\",\"type\":\"R\"},{\"field\":\"Miles_per_Gallon\",\"channel\":\"y\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -290,7 +295,7 @@
"value": null
},
{
"test": "!(length(data(\"brush_store\"))) || (vlInterval(\"brush_store\", datum))",
"test": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))",
"scale": "color",
"field": "Cylinders"
},
Expand Down
15 changes: 8 additions & 7 deletions examples/compiled/interactive_concat_layer.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
},
{
"type": "filter",
"expr": "!(length(data(\"pts_store\"))) || (vlSingle(\"pts_store\", datum))"
"expr": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))"
},
{
"type": "aggregate",
Expand Down Expand Up @@ -160,10 +160,7 @@
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
},
{
"name": "pts",
"update": "data(\"pts_store\").length && {Major_Genre: data(\"pts_store\")[0].values[0]}"
}
{"name": "pts", "update": "vlSelectionResolve(\"pts_store\")"}
],
"layout": {
"padding": {"row": 10, "column": 10},
Expand Down Expand Up @@ -314,11 +311,15 @@
"on": [
{
"events": [{"source": "scope", "type": "click"}],
"update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", encodings: [\"x\"], fields: [\"Major_Genre\"], values: [datum[\"Major_Genre\"]]} : null",
"update": "datum && item().mark.marktype !== 'group' ? {unit: \"concat_1\", fields: pts_tuple_fields, values: [datum[\"Major_Genre\"]]} : null",
"force": true
}
]
},
{
"name": "pts_tuple_fields",
"update": "[{\"field\":\"Major_Genre\",\"channel\":\"x\",\"type\":\"E\"}]"
},
{
"name": "pts_modify",
"on": [
Expand All @@ -343,7 +344,7 @@
"value": null
},
{
"test": "!(length(data(\"pts_store\"))) || (vlSingle(\"pts_store\", datum))",
"test": "!(length(data(\"pts_store\"))) || (vlSelectionTest(\"pts_store\", datum))",
"value": "steelblue"
},
{"value": "grey"}
Expand Down
27 changes: 20 additions & 7 deletions examples/compiled/interactive_dashboard_europe_pop.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,8 @@
"on": [
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
}
},
{"name": "brush", "update": "vlSelectionResolve(\"brush_store\")"}
],
"layout": {
"padding": {"row": 10, "column": 10},
Expand Down Expand Up @@ -419,10 +420,14 @@
"on": [
{
"events": [{"signal": "brush_Country"}],
"update": "brush_Country ? {unit: \"concat_0\", intervals: [{encoding: \"y\", field: \"Country\", extent: brush_Country}]} : null"
"update": "brush_Country ? {unit: \"concat_0\", fields: brush_tuple_fields, values: [brush_Country]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"Country\",\"channel\":\"y\",\"type\":\"E\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -561,7 +566,7 @@
"value": null
},
{
"test": "!(length(data(\"brush_store\"))) || (!(vlInterval(\"brush_store\", datum)))",
"test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
"value": "steelblue"
},
{"value": "goldenrod"}
Expand Down Expand Up @@ -728,10 +733,14 @@
"on": [
{
"events": [{"signal": "brush_Country"}],
"update": "brush_Country ? {unit: \"concat_1\", intervals: [{encoding: \"y\", field: \"Country\", extent: brush_Country}]} : null"
"update": "brush_Country ? {unit: \"concat_1\", fields: brush_tuple_fields, values: [brush_Country]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"Country\",\"channel\":\"y\",\"type\":\"E\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -870,7 +879,7 @@
"value": null
},
{
"test": "!(length(data(\"brush_store\"))) || (!(vlInterval(\"brush_store\", datum)))",
"test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
"value": "steelblue"
},
{"value": "goldenrod"}
Expand Down Expand Up @@ -1098,10 +1107,14 @@
{"signal": "brush_Population_ages_65_and_above_of_total"},
{"signal": "brush_Population_ages_15_64_of_total"}
],
"update": "brush_Population_ages_65_and_above_of_total && brush_Population_ages_15_64_of_total ? {unit: \"concat_2\", intervals: [{encoding: \"x\", field: \"Population_ages_65_and_above_of_total\", extent: brush_Population_ages_65_and_above_of_total}, {encoding: \"y\", field: \"Population_ages_15_64_of_total\", extent: brush_Population_ages_15_64_of_total}]} : null"
"update": "brush_Population_ages_65_and_above_of_total && brush_Population_ages_15_64_of_total ? {unit: \"concat_2\", fields: brush_tuple_fields, values: [brush_Population_ages_65_and_above_of_total, brush_Population_ages_15_64_of_total]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"Population_ages_65_and_above_of_total\",\"channel\":\"x\",\"type\":\"R\"},{\"field\":\"Population_ages_15_64_of_total\",\"channel\":\"y\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -1248,7 +1261,7 @@
"value": null
},
{
"test": "!(length(data(\"brush_store\"))) || (!(vlInterval(\"brush_store\", datum)))",
"test": "!(length(data(\"brush_store\"))) || (!(vlSelectionTest(\"brush_store\", datum)))",
"value": "steelblue"
},
{"value": "goldenrod"}
Expand Down
27 changes: 20 additions & 7 deletions examples/compiled/interactive_layered_crossfilter.vg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
{
"type": "filter",
"expr": "!(length(data(\"brush_store\"))) || (vlInterval(\"brush_store\", datum))"
"expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
},
{
"type": "aggregate",
Expand Down Expand Up @@ -131,7 +131,7 @@
},
{
"type": "filter",
"expr": "!(length(data(\"brush_store\"))) || (vlInterval(\"brush_store\", datum))"
"expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
},
{
"type": "aggregate",
Expand Down Expand Up @@ -191,7 +191,7 @@
},
{
"type": "filter",
"expr": "!(length(data(\"brush_store\"))) || (vlInterval(\"brush_store\", datum))"
"expr": "!(length(data(\"brush_store\"))) || (vlSelectionTest(\"brush_store\", datum))"
},
{
"type": "aggregate",
Expand All @@ -210,7 +210,8 @@
"on": [
{"events": "mousemove", "update": "isTuple(group()) ? group() : unit"}
]
}
},
{"name": "brush", "update": "vlSelectionResolve(\"brush_store\")"}
],
"layout": {
"padding": {"row": 10, "column": 10},
Expand Down Expand Up @@ -291,10 +292,14 @@
"on": [
{
"events": [{"signal": "brush_distance"}],
"update": "brush_distance ? {unit: \"child_distance_layer_0\", intervals: [{encoding: \"x\", field: \"distance\", extent: brush_distance}]} : null"
"update": "brush_distance ? {unit: \"child_distance_layer_0\", fields: brush_tuple_fields, values: [brush_distance]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"distance\",\"channel\":\"x\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -635,10 +640,14 @@
"on": [
{
"events": [{"signal": "brush_delay"}],
"update": "brush_delay ? {unit: \"child_delay_layer_0\", intervals: [{encoding: \"x\", field: \"delay\", extent: brush_delay}]} : null"
"update": "brush_delay ? {unit: \"child_delay_layer_0\", fields: brush_tuple_fields, values: [brush_delay]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"delay\",\"channel\":\"x\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down Expand Up @@ -979,10 +988,14 @@
"on": [
{
"events": [{"signal": "brush_time"}],
"update": "brush_time ? {unit: \"child_time_layer_0\", intervals: [{encoding: \"x\", field: \"time\", extent: brush_time}]} : null"
"update": "brush_time ? {unit: \"child_time_layer_0\", fields: brush_tuple_fields, values: [brush_time]} : null"
}
]
},
{
"name": "brush_tuple_fields",
"update": "[{\"field\":\"time\",\"channel\":\"x\",\"type\":\"R\"}]"
},
{
"name": "brush_translate_anchor",
"value": {},
Expand Down
Loading