Fixes edges
This commit is contained in:
parent
c275a98cbe
commit
1fa38a15ba
|
@ -38,7 +38,7 @@ module DemoDist = {
|
||||||
let continuous: DistTypes.xyShape = {xs, ys};
|
let continuous: DistTypes.xyShape = {xs, ys};
|
||||||
<Antd.Card title={"Distribution" |> E.ste}>
|
<Antd.Card title={"Distribution" |> E.ste}>
|
||||||
<div className=Styles.spacer />
|
<div className=Styles.spacer />
|
||||||
<DistributionPlot height=200 continuous />
|
<DistributionPlot continuous />
|
||||||
</Antd.Card>;
|
</Antd.Card>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,15 +12,14 @@ export class CdfChartD3 {
|
||||||
this.attrs = {
|
this.attrs = {
|
||||||
svgWidth: 400,
|
svgWidth: 400,
|
||||||
svgHeight: 400,
|
svgHeight: 400,
|
||||||
|
|
||||||
marginTop: 5,
|
marginTop: 5,
|
||||||
marginBottom: 5,
|
marginBottom: 5,
|
||||||
marginRight: 50,
|
marginRight: 50,
|
||||||
marginLeft: 5,
|
marginLeft: 5,
|
||||||
|
|
||||||
container: null,
|
container: null,
|
||||||
minX: false,
|
minX: null,
|
||||||
maxX: false,
|
maxX: null,
|
||||||
scale: 'linear',
|
scale: 'linear',
|
||||||
timeScale: null,
|
timeScale: null,
|
||||||
showDistributionLines: true,
|
showDistributionLines: true,
|
||||||
|
@ -54,11 +53,20 @@ export class CdfChartD3 {
|
||||||
this.formatDates = this.formatDates.bind(this);
|
this.formatDates = this.formatDates.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} name
|
||||||
|
* @param value
|
||||||
|
* @returns {CdfChartD3}
|
||||||
|
*/
|
||||||
set(name, value) {
|
set(name, value) {
|
||||||
_.set(this.attrs, [name], value);
|
_.set(this.attrs, [name], value);
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param data
|
||||||
|
* @returns {CdfChartD3}
|
||||||
|
*/
|
||||||
data(data) {
|
data(data) {
|
||||||
this.attrs.data = data;
|
this.attrs.data = data;
|
||||||
this.attrs.data.continuous = data.continuous || {
|
this.attrs.data.continuous = data.continuous || {
|
||||||
|
@ -78,6 +86,42 @@ export class CdfChartD3 {
|
||||||
console.error('Container for D3 is not defined.');
|
console.error('Container for D3 is not defined.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!['log', 'linear'].includes(this.attrs.scale)) {
|
||||||
|
console.error('Scale should be either "log" or "linear".');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log Scale.
|
||||||
|
if (this.attrs.scale === 'log') {
|
||||||
|
this.logFilter('continuous');
|
||||||
|
this.logFilter('discrete');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
this.attrs.scale === 'log'
|
||||||
|
&& this.attrs.minX !== null
|
||||||
|
&& this.attrs.minX < 0
|
||||||
|
) {
|
||||||
|
console.warn('minX should be positive.');
|
||||||
|
this.attrs.minX = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fields.
|
||||||
|
const fields = [
|
||||||
|
'marginLeft', 'marginRight',
|
||||||
|
'marginTop', 'marginBottom',
|
||||||
|
'svgWidth', 'svgHeight',
|
||||||
|
'yMaxContinuousDomainFactor',
|
||||||
|
'yMaxDiscreteDomainFactor',
|
||||||
|
'logBase',
|
||||||
|
];
|
||||||
|
for (const field of fields) {
|
||||||
|
if (!_.isNumber(this.attrs[field])) {
|
||||||
|
console.error(`${field} should be a number.`);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Sets the width from the DOM element.
|
// Sets the width from the DOM element.
|
||||||
const containerRect = this._container.node().getBoundingClientRect();
|
const containerRect = this._container.node().getBoundingClientRect();
|
||||||
if (containerRect.width > 0) {
|
if (containerRect.width > 0) {
|
||||||
|
@ -124,13 +168,9 @@ export class CdfChartD3 {
|
||||||
*/
|
*/
|
||||||
getCommonThings() {
|
getCommonThings() {
|
||||||
// Boundaries.
|
// Boundaries.
|
||||||
const xMin = this.attrs.scale === 'linear' ?
|
const xMin = this.attrs.minX
|
||||||
(this.attrs.minX
|
|
||||||
|| d3.min(this.attrs.data.continuous.xs)
|
|| d3.min(this.attrs.data.continuous.xs)
|
||||||
|| d3.min(this.attrs.data.discrete.xs))
|
|| d3.min(this.attrs.data.discrete.xs);
|
||||||
: (this.attrs.minX > 0 ? this.attrs.minX : undefined)
|
|
||||||
|| d3.min(this.attrs.data.continuous.xs.filter(i => i > 0))
|
|
||||||
|| d3.min(this.attrs.data.discrete.xs.filter(i => i > 0));
|
|
||||||
const xMax = this.attrs.maxX
|
const xMax = this.attrs.maxX
|
||||||
|| d3.max(this.attrs.data.continuous.xs)
|
|| d3.max(this.attrs.data.continuous.xs)
|
||||||
|| d3.max(this.attrs.data.discrete.xs);
|
|| d3.max(this.attrs.data.discrete.xs);
|
||||||
|
@ -138,10 +178,11 @@ export class CdfChartD3 {
|
||||||
const yMin = d3.min(this.attrs.data.continuous.ys);
|
const yMin = d3.min(this.attrs.data.continuous.ys);
|
||||||
const yMax = d3.max(this.attrs.data.continuous.ys);
|
const yMax = d3.max(this.attrs.data.continuous.ys);
|
||||||
|
|
||||||
if (!_.isFinite(xMin)) console.error('xMin is undefined');
|
// Errors.
|
||||||
if (!_.isFinite(xMax)) console.error('xMax is undefined');
|
if (!_.isFinite(xMin)) return console.error('xMin is undefined');
|
||||||
if (!_.isFinite(yMin)) console.error('yMin is undefined');
|
if (!_.isFinite(xMax)) return console.error('xMax is undefined');
|
||||||
if (!_.isFinite(yMax)) console.error('yMax is undefined');
|
if (!_.isFinite(yMin)) return console.error('yMin is undefined');
|
||||||
|
if (!_.isFinite(yMax)) return console.error('yMax is undefined');
|
||||||
|
|
||||||
// X-domains.
|
// X-domains.
|
||||||
const yMaxDomainFactor = _.get(this.attrs, 'yMaxContinuousDomainFactor', 1);
|
const yMaxDomainFactor = _.get(this.attrs, 'yMaxContinuousDomainFactor', 1);
|
||||||
|
@ -462,7 +503,7 @@ export class CdfChartD3 {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {name} key
|
* @param {string} key
|
||||||
* @returns {{x: number[], y: number[]}}
|
* @returns {{x: number[], y: number[]}}
|
||||||
*/
|
*/
|
||||||
getDataPoints(key) {
|
getDataPoints(key) {
|
||||||
|
@ -481,6 +522,29 @@ export class CdfChartD3 {
|
||||||
return dt;
|
return dt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} key
|
||||||
|
* @returns {{x: number[], y: number[]}}
|
||||||
|
*/
|
||||||
|
logFilter(key) {
|
||||||
|
const xs = [];
|
||||||
|
const ys = [];
|
||||||
|
const emptyShape = { xs: [], ys: [] };
|
||||||
|
const data = _.get(this.attrs.data, key, emptyShape);
|
||||||
|
|
||||||
|
for (let i = 0, len = data.xs.length; i < len; i++) {
|
||||||
|
const x = data.xs[i];
|
||||||
|
const y = data.ys[i];
|
||||||
|
if (x > 0) {
|
||||||
|
xs.push(x);
|
||||||
|
ys.push(y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_.set(this.attrs.data, [key, 'xs'], xs);
|
||||||
|
_.set(this.attrs.data, [key, 'ys'], ys);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {string} key
|
* @param {string} key
|
||||||
* @returns {boolean}
|
* @returns {boolean}
|
||||||
|
|
|
@ -46,13 +46,13 @@ function CdfChartReact(props) {
|
||||||
.set('marginTop', 5)
|
.set('marginTop', 5)
|
||||||
.set('showDistributionLines', props.showDistributionLines)
|
.set('showDistributionLines', props.showDistributionLines)
|
||||||
.set('showDistributionYAxis', props.showDistributionYAxis)
|
.set('showDistributionYAxis', props.showDistributionYAxis)
|
||||||
.set('verticalLine', props.verticalLine)
|
.set('verticalLine', props.verticalLine || 110)
|
||||||
.set('showVerticalLine', props.showVerticalLine)
|
.set('showVerticalLine', props.showVerticalLine)
|
||||||
.set('container', containerRef.current)
|
.set('container', containerRef.current)
|
||||||
.set('scale', scale)
|
.set('scale', scale)
|
||||||
.set('timeScale', props.timeScale)
|
.set('timeScale', props.timeScale)
|
||||||
.set('yMaxContinuousDomainFactor', props.yMaxContinuousDomainFactor)
|
.set('yMaxContinuousDomainFactor', props.yMaxContinuousDomainFactor || 1)
|
||||||
.set('yMaxDiscreteDomainFactor', props.yMaxDiscreteDomainFactor)
|
.set('yMaxDiscreteDomainFactor', props.yMaxDiscreteDomainFactor || 1)
|
||||||
.data({
|
.data({
|
||||||
continuous: props.continuous,
|
continuous: props.continuous,
|
||||||
discrete: props.discrete,
|
discrete: props.discrete,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user