ngx-line-chart
Advanced tools
Comparing version 1.0.0-rc.0 to 1.0.0-rc.1
@@ -8,5 +8,5 @@ import { IDataSetStyle } from './data-set-style'; | ||
fontSize?: number; | ||
angle: number; | ||
angle?: number; | ||
}; | ||
}; | ||
} |
@@ -32,5 +32,5 @@ import { IChartStyle } from '../chart-style'; | ||
pointsToPath(scaledCoordinates: IScaledPoint[]): string; | ||
getScaledPoints(points: IPoint[]): IScaledPoint[]; | ||
getScaledPoints(points: IPoint[], asd?: boolean): IScaledPoint[]; | ||
private getXLabel(x); | ||
private getYLabel(y); | ||
} |
12
index.js
@@ -106,16 +106,18 @@ import { CommonModule } from '@angular/common'; | ||
* @param {?} points | ||
* @param {?=} asd | ||
* @return {?} | ||
*/ | ||
ChartComponent.prototype.getScaledPoints = function (points) { | ||
ChartComponent.prototype.getScaledPoints = function (points, asd) { | ||
var _this = this; | ||
if (asd === void 0) { asd = false; } | ||
var /** @type {?} */ minAndMaxX = ChartComponent.findMinAndMax(points.map(function (point) { return point.x; })); | ||
var /** @type {?} */ minAndMaxY = ChartComponent.findMinAndMax(points.map(function (point) { return point.y; })); | ||
return points.map(function (point) { | ||
var /** @type {?} */ scaledX = ChartComponent.scaleValueBetween0And1(point.x, minAndMaxX, 'x'); | ||
var /** @type {?} */ scaledY = ChartComponent.scaleValueBetween0And1(point.y, minAndMaxY, 'y'); | ||
var /** @type {?} */ scaledX = ChartComponent.scaleValueBetween0And1(point.x, minAndMaxX, 'x'); | ||
return { | ||
originalX: point.x, | ||
originalY: point.y, | ||
x: Math.max(scaledX * (_this.width - _this.padding), _this.padding), | ||
y: Math.min(Math.max(_this.height - scaledY * _this.height, _this.padding), _this.height - _this.padding) | ||
x: scaledX * (_this.width - 2 * _this.padding) + _this.padding, | ||
y: _this.height - ((scaledY * (_this.height - 2 * _this.padding)) + _this.padding), | ||
}; | ||
@@ -257,3 +259,3 @@ }).sort(function (a, b) { return a.originalX - b.originalX; }); | ||
var /** @type {?} */ range = lastPointX - firstPointX; | ||
for (var /** @type {?} */ i = 1; i < n; ++i) { | ||
for (var /** @type {?} */ i = 1; i < n - 1; ++i) { | ||
result.push(range / (n - 1) * i + firstPointX); | ||
@@ -260,0 +262,0 @@ } |
@@ -8,3 +8,3 @@ import { OnChanges, OnInit } from '@angular/core'; | ||
style: IChartStyle; | ||
private _xAxisValues; | ||
_xAxisValues: any; | ||
private static getDefaultXAxis(dataSets); | ||
@@ -11,0 +11,0 @@ private static ensureDataSetsHaveSameXValues(dataSets); |
@@ -110,16 +110,18 @@ (function (global, factory) { | ||
* @param {?} points | ||
* @param {?=} asd | ||
* @return {?} | ||
*/ | ||
ChartComponent.prototype.getScaledPoints = function (points) { | ||
ChartComponent.prototype.getScaledPoints = function (points, asd) { | ||
var _this = this; | ||
if (asd === void 0) { asd = false; } | ||
var /** @type {?} */ minAndMaxX = ChartComponent.findMinAndMax(points.map(function (point) { return point.x; })); | ||
var /** @type {?} */ minAndMaxY = ChartComponent.findMinAndMax(points.map(function (point) { return point.y; })); | ||
return points.map(function (point) { | ||
var /** @type {?} */ scaledX = ChartComponent.scaleValueBetween0And1(point.x, minAndMaxX, 'x'); | ||
var /** @type {?} */ scaledY = ChartComponent.scaleValueBetween0And1(point.y, minAndMaxY, 'y'); | ||
var /** @type {?} */ scaledX = ChartComponent.scaleValueBetween0And1(point.x, minAndMaxX, 'x'); | ||
return { | ||
originalX: point.x, | ||
originalY: point.y, | ||
x: Math.max(scaledX * (_this.width - _this.padding), _this.padding), | ||
y: Math.min(Math.max(_this.height - scaledY * _this.height, _this.padding), _this.height - _this.padding) | ||
x: scaledX * (_this.width - 2 * _this.padding) + _this.padding, | ||
y: _this.height - ((scaledY * (_this.height - 2 * _this.padding)) + _this.padding), | ||
}; | ||
@@ -261,3 +263,3 @@ }).sort(function (a, b) { return a.originalX - b.originalX; }); | ||
var /** @type {?} */ range = lastPointX - firstPointX; | ||
for (var /** @type {?} */ i = 1; i < n; ++i) { | ||
for (var /** @type {?} */ i = 1; i < n - 1; ++i) { | ||
result.push(range / (n - 1) * i + firstPointX); | ||
@@ -264,0 +266,0 @@ } |
{ | ||
"name": "ngx-line-chart", | ||
"version": "1.0.0-rc.0", | ||
"version": "1.0.0-rc.1", | ||
"repository": { | ||
@@ -5,0 +5,0 @@ "type": "git", |
53326
851