Skip to content

Commit a4ba03d

Browse files
committed
moved up blocklinecount
(cherry picked from commit e390433)
1 parent 455a642 commit a4ba03d

File tree

6 files changed

+17
-14
lines changed

6 files changed

+17
-14
lines changed

src/traces/parcoords/attributes.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,17 @@ module.exports = {
144144
}
145145
),
146146

147+
blocklinecount: {
148+
valType: 'number',
149+
dflt: 5000,
150+
min: 1,
151+
role: 'info',
152+
description: [
153+
'The number of lines rendered in one 16ms rendering frame. Use 2000-5000 on low-end hardware to remain',
154+
'responsive, and 10000 .. 100000 on strong hardware for faster rendering.'
155+
].join(' ')
156+
},
157+
147158
lines: {
148159
contextcolor: {
149160
valType: 'data_array',
@@ -170,17 +181,6 @@ module.exports = {
170181
description: 'Line rendering pixel ratio. A lower value yields faster rendering but blockier lines.'
171182
},
172183

173-
blocklinecount: {
174-
valType: 'number',
175-
dflt: 5000,
176-
min: 1,
177-
role: 'info',
178-
description: [
179-
'The number of lines rendered in one 16ms rendering frame. Use 2000-5000 on low-end hardware to remain',
180-
'responsive, and 10000 .. 100000 on strong hardware for faster rendering.'
181-
].join(' ')
182-
},
183-
184184
focusalphablending: {
185185
valType: 'boolean',
186186
dflt: false,

src/traces/parcoords/calc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ module.exports = function calc(gd, trace) {
7474
domain: trace.domain,
7575
dimensions: cd,
7676
tickdistance: trace.tickdistance,
77+
blocklinecount: trace.blocklinecount,
7778
lines: trace.lines,
7879
line: trace.line,
7980
padding: trace.padding,

src/traces/parcoords/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
7878

7979
coerce('tickdistance');
8080
coerce('padding');
81+
coerce('blocklinecount');
8182

8283
coerce('domain.x');
8384
coerce('domain.y');
@@ -87,7 +88,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
8788
coerce('lines.contextcolor');
8889
coerce('lines.contextopacity');
8990
coerce('lines.pixelratio');
90-
coerce('lines.blocklinecount');
9191
coerce('lines.focusalphablending');
9292
coerce('lines.verticalpadding');
9393
};

src/traces/parcoords/lines.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ module.exports = function(canvasGL, lines, canvasWidth, canvasHeight, dimensions
356356
previousAxisOrder[i] = [x, nextDim.canvasX];
357357
var item = makeItem(i, ii, x, panelSizeX, dimension.originalXIndex, dimension.scatter);
358358
renderState.clearOnly = clearOnly;
359-
renderBlock(regl, glAes, renderState, setChanged ? lines.blocklinecount : sampleCount, sampleCount, item);
359+
renderBlock(regl, glAes, renderState, setChanged ? lines.blockLineCount : sampleCount, sampleCount, item);
360360
}
361361
}
362362
}

src/traces/parcoords/parcoords.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ function model(layout, d, i) {
9696

9797
var lines = Lib.extendDeep(d.lines, {
9898
color: d.line.color.map(domainToUnitScale({values: d.line.color})),
99+
blockLineCount: d.blocklinecount,
99100
canvasOverdrag: overdrag * canvasPixelRatio
100101
});
101102

test/jasmine/tests/parcoords_test.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)