chartwerk
/
core
4
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity
Browse Source

getters to methods

merge-requests/6/head
vargburz 3 years ago
parent
1005973e66
commit
2f719b69cc
2 changed files with 14 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      src/index.ts
  2. 18
      src/state.ts

11
src/index.ts
Unescape View File

@ -827,20 +827,19 @@ abstract class ChartwerkPod<T extends TimeSerie, O extends Options> {
// TODO: move to State // TODO: move to State
get absXScale(): d3.ScaleLinear<number, number> { get absXScale(): d3.ScaleLinear<number, number> {
const domain = [0, Math.abs(this.state.maxValueX - this.state.minValueX)]; const domain = [0, Math.abs(this.state.getMaxValueX() - this.state.getMinValueX())];
return this.d3.scaleLinear() return this.d3.scaleLinear()
.domain(domain) .domain(domain)
.range([0, this.width]); .range([0, this.width]);
} }
get absYScale(): d3.ScaleLinear<number, number> { get absYScale(): d3.ScaleLinear<number, number> {
const domain = [0, Math.abs(this.state.maxValueY - this.state.minValueY)]; const domain = [0, Math.abs(this.state.getMaxValueY() - this.state.getMinValueY())];
return this.d3.scaleLinear() return this.d3.scaleLinear()
.domain(domain) .domain(domain)
.range([0, this.height]); .range([0, this.height]);
} }
// TODO: these getters can be removed, but it will break all Pods.
get xScale(): d3.ScaleLinear<number, number> { get xScale(): d3.ScaleLinear<number, number> {
return this.state.xScale; return this.state.xScale;
} }
@ -991,7 +990,7 @@ abstract class ChartwerkPod<T extends TimeSerie, O extends Options> {
return mergeWith({}, DEFAULT_MARGIN, this.extraMargin, add); return mergeWith({}, DEFAULT_MARGIN, this.extraMargin, add);
} }
formatedBound(alias: string, target: string): string { formattedBound(alias: string, target: string): string {
const confidenceMetric = replace(alias, '$__metric_name', target); const confidenceMetric = replace(alias, '$__metric_name', target);
return confidenceMetric; return confidenceMetric;
} }
@ -1023,8 +1022,8 @@ abstract class ChartwerkPod<T extends TimeSerie, O extends Options> {
} }
let series = []; let series = [];
this.series.forEach(serie => { this.series.forEach(serie => {
series.push(this.formatedBound(this.options.bounds.upper, serie.target)); series.push(this.formattedBound(this.options.bounds.upper, serie.target));
series.push(this.formatedBound(this.options.bounds.lower, serie.target)); series.push(this.formattedBound(this.options.bounds.lower, serie.target));
}); });
return series; return series;
} }

18
src/state.ts
Unescape View File

@ -42,9 +42,9 @@ export class PodState<T extends TimeSerie, O extends Options> {
} }
protected setInitialRanges(): void { protected setInitialRanges(): void {
this._xValueRange = [this.minValueX, this.maxValueX]; this._xValueRange = [this.getMinValueX(), this.getMaxValueX()];
this._yValueRange = [this.minValueY, this.maxValueY]; this._yValueRange = [this.getMinValueY(), this.getMaxValueY()];
this._y1ValueRange = [this.minValueY1, this.maxValueY1]; this._y1ValueRange = [this.getMinValueY1(), this.getMaxValueY1()];
} }
protected initScales(): void { protected initScales(): void {
@ -137,7 +137,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
this._transform.k = transform.k !== undefined ? transform.k : this._transform.k; this._transform.k = transform.k !== undefined ? transform.k : this._transform.k;
} }
get minValueY(): number { public getMinValueY(): number {
if(this.isSeriesUnavailable) { if(this.isSeriesUnavailable) {
return DEFAULT_AXIS_RANGE[0]; return DEFAULT_AXIS_RANGE[0];
} }
@ -154,7 +154,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
return minValue; return minValue;
} }
get maxValueY(): number { public getMaxValueY(): number {
if(this.isSeriesUnavailable) { if(this.isSeriesUnavailable) {
return DEFAULT_AXIS_RANGE[1]; return DEFAULT_AXIS_RANGE[1];
} }
@ -171,7 +171,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
return maxValue; return maxValue;
} }
get minValueX(): number { public getMinValueX(): number {
if(this.isSeriesUnavailable) { if(this.isSeriesUnavailable) {
return DEFAULT_AXIS_RANGE[0]; return DEFAULT_AXIS_RANGE[0];
} }
@ -189,7 +189,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
return minValue; return minValue;
} }
get maxValueX(): number { public getMaxValueX(): number {
if(this.isSeriesUnavailable) { if(this.isSeriesUnavailable) {
return DEFAULT_AXIS_RANGE[1]; return DEFAULT_AXIS_RANGE[1];
} }
@ -206,7 +206,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
return maxValue; return maxValue;
} }
get minValueY1(): number { public getMinValueY1(): number {
if(this.isSeriesUnavailable || this.options.axis.y1 === undefined || this.options.axis.y1.isActive === false) { if(this.isSeriesUnavailable || this.options.axis.y1 === undefined || this.options.axis.y1.isActive === false) {
return DEFAULT_AXIS_RANGE[0]; return DEFAULT_AXIS_RANGE[0];
} }
@ -223,7 +223,7 @@ export class PodState<T extends TimeSerie, O extends Options> {
return minValue; return minValue;
} }
get maxValueY1(): number { public getMaxValueY1(): number {
if(this.isSeriesUnavailable || this.options.axis.y1 === undefined || this.options.axis.y1.isActive === false) { if(this.isSeriesUnavailable || this.options.axis.y1 === undefined || this.options.axis.y1.isActive === false) {
return DEFAULT_AXIS_RANGE[1]; return DEFAULT_AXIS_RANGE[1];
} }

Write Preview
Loading…
Cancel
Save