Skip to content

Commit

Permalink
fix: respect line's orient even if the "measure" is discrete to suppo…
Browse files Browse the repository at this point in the history 
…rt bump chart (#7142)

* fix: respect line's orient even if the "measure" is discrete to support bump chart

* chore: update examples [CI]

Co-authored-by: GitHub Actions Bot <[email protected]>
  • Loading branch information
@kanitw
kanitw and GitHub Actions Bot authored Jan 3, 2021
1 parent 0f10301 commit 1c4afb8
Show file tree
Hide file tree
Showing 7 changed files with 231 additions and 13 deletions.
Binary file added examples/compiled/line_bump.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions examples/compiled/line_bump.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
150 changes: 150 additions & 0 deletions examples/compiled/line_bump.vg.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
{
"$schema": "https://vega.github.io/schema/vega/v5.json",
"description": "Bump chart",
"background": "white",
"padding": 5,
"width": 200,
"style": "cell",
"data": [
{
"name": "source_0",
"values": [
{"build": 1, "result": "PASSED"},
{"build": 2, "result": "PASSED"},
{"build": 3, "result": "FAILED"},
{"build": 4, "result": "FAILED"},
{"build": 5, "result": "SKIPPED"},
{"build": 6, "result": "PASSED"},
{"build": 7, "result": "PASSED"},
{"build": 8, "result": "FAILED"},
{"build": 9, "result": "PASSED"},
{"build": 10, "result": "PASSED"},
{"build": 11, "result": "SKIPPED"},
{"build": 12, "result": "PASSED"},
{"build": 13, "result": "PASSED"},
{"build": 14, "result": "FAILED"},
{"build": 15, "result": "PASSED"},
{"build": 16, "result": "SKIPPED"}
]
},
{
"name": "data_0",
"source": "source_0",
"transform": [
{
"type": "filter",
"expr": "isValid(datum[\"build\"]) && isFinite(+datum[\"build\"])"
}
]
}
],
"signals": [
{"name": "y_step", "value": 20},
{
"name": "height",
"update": "bandspace(domain('y').length, 1, 0.5) * y_step"
}
],
"marks": [
{
"name": "layer_0_marks",
"type": "line",
"style": ["line"],
"sort": {"field": ["datum[\"build\"]"], "order": ["ascending"]},
"from": {"data": "source_0"},
"encode": {
"update": {
"stroke": {"value": "#4c78a8"},
"description": {
"signal": "\"build: \" + (format(datum[\"build\"], \"\")) + \"; result: \" + (isValid(datum[\"result\"]) ? datum[\"result\"] : \"\"+datum[\"result\"])"
},
"x": {"scale": "x", "field": "build"},
"y": {"scale": "y", "field": "result"},
"defined": {
"signal": "isValid(datum[\"build\"]) && isFinite(+datum[\"build\"])"
}
}
}
},
{
"name": "layer_1_marks",
"type": "symbol",
"style": ["point"],
"sort": {"field": ["datum[\"build\"]"], "order": ["ascending"]},
"from": {"data": "data_0"},
"encode": {
"update": {
"opacity": {"value": 1},
"fill": {"value": "#4c78a8"},
"ariaRoleDescription": {"value": "point"},
"description": {
"signal": "\"build: \" + (format(datum[\"build\"], \"\")) + \"; result: \" + (isValid(datum[\"result\"]) ? datum[\"result\"] : \"\"+datum[\"result\"])"
},
"x": {"scale": "x", "field": "build"},
"y": {"scale": "y", "field": "result"}
}
}
}
],
"scales": [
{
"name": "x",
"type": "linear",
"domain": {
"fields": [
{"data": "source_0", "field": "build"},
{"data": "data_0", "field": "build"}
]
},
"range": [0, {"signal": "width"}],
"nice": true,
"zero": true
},
{
"name": "y",
"type": "point",
"domain": {
"fields": [
{"data": "source_0", "field": "result"},
{"data": "data_0", "field": "result"}
],
"sort": true
},
"range": {"step": {"signal": "y_step"}},
"padding": 0.5
}
],
"axes": [
{
"scale": "x",
"orient": "bottom",
"gridScale": "y",
"grid": true,
"tickCount": {"signal": "ceil(width/40)"},
"domain": false,
"labels": false,
"aria": false,
"maxExtent": 0,
"minExtent": 0,
"ticks": false,
"zindex": 0
},
{
"scale": "x",
"orient": "bottom",
"grid": false,
"title": "build",
"labelFlush": true,
"labelOverlap": true,
"tickCount": {"signal": "ceil(width/40)"},
"zindex": 0
},
{
"scale": "y",
"orient": "left",
"grid": false,
"title": "result",
"zindex": 0
}
]
}
30 changes: 30 additions & 0 deletions examples/specs/line_bump.vl.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$schema": "https://vega.github.io/schema/vega-lite/v4.json",
"description": "Bump chart",
"data": {
"values": [
{"build": 1, "result": "PASSED"},
{"build": 2, "result": "PASSED"},
{"build": 3, "result": "FAILED"},
{"build": 4, "result": "FAILED"},
{"build": 5, "result": "SKIPPED"},
{"build": 6, "result": "PASSED"},
{"build": 7, "result": "PASSED"},
{"build": 8, "result": "FAILED"},
{"build": 9, "result": "PASSED"},
{"build": 10, "result": "PASSED"},
{"build": 11, "result": "SKIPPED"},
{"build": 12, "result": "PASSED"},
{"build": 13, "result": "PASSED"},
{"build": 14, "result": "FAILED"},
{"build": 15, "result": "PASSED"},
{"build": 16, "result": "SKIPPED"}
]
},
"mark": {"type": "line", "point": true},
"encoding": {
"x": {"field": "build", "type": "quantitative"},
"y": {"field": "result", "type": "nominal"},
"order": {"field": "build", "type": "quantitative"}
}
}
42 changes: 42 additions & 0 deletions examples/specs/normalized/line_bump_normalized.vl.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"$schema": "https://vega.github.io/schema/vega-lite/v4.json",
"description": "Bump chart",
"data": {
"values": [
{"build": 1, "result": "PASSED"},
{"build": 2, "result": "PASSED"},
{"build": 3, "result": "FAILED"},
{"build": 4, "result": "FAILED"},
{"build": 5, "result": "SKIPPED"},
{"build": 6, "result": "PASSED"},
{"build": 7, "result": "PASSED"},
{"build": 8, "result": "FAILED"},
{"build": 9, "result": "PASSED"},
{"build": 10, "result": "PASSED"},
{"build": 11, "result": "SKIPPED"},
{"build": 12, "result": "PASSED"},
{"build": 13, "result": "PASSED"},
{"build": 14, "result": "FAILED"},
{"build": 15, "result": "PASSED"},
{"build": 16, "result": "SKIPPED"}
]
},
"layer": [
{
"mark": "line",
"encoding": {
"x": {"field": "build", "type": "quantitative"},
"y": {"field": "result", "type": "nominal"},
"order": {"field": "build", "type": "quantitative"}
}
},
{
"mark": {"type": "point", "opacity": 1, "filled": true},
"encoding": {
"x": {"field": "build", "type": "quantitative"},
"y": {"field": "result", "type": "nominal"},
"order": {"field": "build", "type": "quantitative"}
}
}
]
}
4 changes: 4 additions & 0 deletions site/_data/examples.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,10 @@
"description": "A connected scatterplot can be created by customizing line `order` and adding `point` overlay in the line mark definition.",
"style": "background-size: auto 105%; background-position: center center !important;"
},
{
"name": "line_bump",
"title": "Bump Chart"
},
{
"name": "trail_color",
"title": "Line Chart with Varying Size (using the trail mark)"
Expand Down
17 changes: 4 additions & 13 deletions src/compile/mark/init.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ function orient(mark: Mark, encoding: Encoding<string>, specifiedOrient: Orienta
// Tick is opposite to bar, line, area and never have ranged mark.
const xIsContinuous = isContinuousFieldOrDatumDef(x);
const yIsContinuous = isContinuousFieldOrDatumDef(y);
if (xIsContinuous && !yIsContinuous) {

if (specifiedOrient) {
return specifiedOrient;
} else if (xIsContinuous && !yIsContinuous) {
return mark !== 'tick' ? 'horizontal' : 'vertical';
} else if (!xIsContinuous && yIsContinuous) {
return mark !== 'tick' ? 'vertical' : 'horizontal';
Expand All @@ -198,20 +201,8 @@ function orient(mark: Mark, encoding: Encoding<string>, specifiedOrient: Orienta
} else if (xDef.aggregate && !yDef.aggregate) {
return mark !== 'tick' ? 'horizontal' : 'vertical';
}

if (specifiedOrient) {
// When ambiguous, use user specified one.
return specifiedOrient;
}

return 'vertical';
} else {
// Discrete x Discrete case
if (specifiedOrient) {
// When ambiguous, use user specified one.
return specifiedOrient;
}

return undefined;
}
}
Expand Down

0 comments on commit 1c4afb8

Please sign in to comment.