rollback fract graphs to standard curve
parent
b7a0c47b32
commit
b79ccbb1af
|
@ -136,7 +136,6 @@
|
||||||
[gradient]="gradient"
|
[gradient]="gradient"
|
||||||
[xAxis]="xAxis"
|
[xAxis]="xAxis"
|
||||||
[yAxis]="yAxis"
|
[yAxis]="yAxis"
|
||||||
[curve]="monotoneYCurve"
|
|
||||||
[legend]="legend"
|
[legend]="legend"
|
||||||
[legendTitle]="legendTitle"
|
[legendTitle]="legendTitle"
|
||||||
[showXAxisLabel]="showXAxisLabel"
|
[showXAxisLabel]="showXAxisLabel"
|
||||||
|
@ -154,7 +153,6 @@
|
||||||
[gradient]="gradient"
|
[gradient]="gradient"
|
||||||
[xAxis]="xAxis"
|
[xAxis]="xAxis"
|
||||||
[yAxis]="yAxis"
|
[yAxis]="yAxis"
|
||||||
[curve]="monotoneYCurve"
|
|
||||||
[legend]="legend"
|
[legend]="legend"
|
||||||
[legendTitle]="legendTitle"
|
[legendTitle]="legendTitle"
|
||||||
[showXAxisLabel]="showXAxisLabel"
|
[showXAxisLabel]="showXAxisLabel"
|
||||||
|
@ -172,7 +170,6 @@
|
||||||
[gradient]="gradient"
|
[gradient]="gradient"
|
||||||
[xAxis]="xAxis"
|
[xAxis]="xAxis"
|
||||||
[yAxis]="yAxis"
|
[yAxis]="yAxis"
|
||||||
[curve]="monotoneYCurve"
|
|
||||||
[legend]="legend"
|
[legend]="legend"
|
||||||
[legendTitle]="legendTitle"
|
[legendTitle]="legendTitle"
|
||||||
[showXAxisLabel]="showXAxisLabel"
|
[showXAxisLabel]="showXAxisLabel"
|
||||||
|
@ -190,7 +187,6 @@
|
||||||
[gradient]="gradient"
|
[gradient]="gradient"
|
||||||
[xAxis]="xAxis"
|
[xAxis]="xAxis"
|
||||||
[yAxis]="yAxis"
|
[yAxis]="yAxis"
|
||||||
[curve]="monotoneYCurve"
|
|
||||||
[legend]="legend"
|
[legend]="legend"
|
||||||
[legendTitle]="legendTitle"
|
[legendTitle]="legendTitle"
|
||||||
[showXAxisLabel]="showXAxisLabel"
|
[showXAxisLabel]="showXAxisLabel"
|
||||||
|
@ -208,7 +204,6 @@
|
||||||
[gradient]="gradient"
|
[gradient]="gradient"
|
||||||
[xAxis]="xAxis"
|
[xAxis]="xAxis"
|
||||||
[yAxis]="yAxis"
|
[yAxis]="yAxis"
|
||||||
[curve]="monotoneYCurve"
|
|
||||||
[legend]="legend"
|
[legend]="legend"
|
||||||
[legendTitle]="legendTitle"
|
[legendTitle]="legendTitle"
|
||||||
[showXAxisLabel]="showXAxisLabel"
|
[showXAxisLabel]="showXAxisLabel"
|
||||||
|
|
|
@ -66,7 +66,6 @@ export class WarDetailComponent {
|
||||||
yAxisLabelStabilize = 'Stabilisiert';
|
yAxisLabelStabilize = 'Stabilisiert';
|
||||||
yAxisLabelFlag = 'Flaggenbesitz';
|
yAxisLabelFlag = 'Flaggenbesitz';
|
||||||
|
|
||||||
monotoneYCurve = d3.curveMonotoneY;
|
|
||||||
stepCurve = d3.curveStepAfter;
|
stepCurve = d3.curveStepAfter;
|
||||||
gradient = false;
|
gradient = false;
|
||||||
yAxis = true;
|
yAxis = true;
|
||||||
|
@ -354,8 +353,6 @@ export class WarDetailComponent {
|
||||||
[this.tmpPointData, this.tmpBudgetData, this.tmpTransportData, this.tmpReviveData, this.tmpStabilizeData,
|
[this.tmpPointData, this.tmpBudgetData, this.tmpTransportData, this.tmpReviveData, this.tmpStabilizeData,
|
||||||
this.tmpKillData, this.tmpFrienlyFireData, this.tmpFlagCaptureData].forEach(tmp => {
|
this.tmpKillData, this.tmpFrienlyFireData, this.tmpFlagCaptureData].forEach(tmp => {
|
||||||
for (let j in [0, 1]) {
|
for (let j in [0, 1]) {
|
||||||
console.log(new Date(tmp[j].series[tmp[j].series.length - 1].name) + '... ' + endDate)
|
|
||||||
console.log(new Date(tmp[j].series[tmp[j].series.length - 1].name) < endDate)
|
|
||||||
if (new Date(tmp[j].series[tmp[j].series.length - 1].name) < endDate) {
|
if (new Date(tmp[j].series[tmp[j].series.length - 1].name) < endDate) {
|
||||||
tmp[j].series.push({
|
tmp[j].series.push({
|
||||||
'name': endDate,
|
'name': endDate,
|
||||||
|
@ -365,8 +362,6 @@ export class WarDetailComponent {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// console.log(this.tmpKillData[0].series[this.tmpKillData[0].series.length-1])
|
|
||||||
// console.log(this.tmpKillData[1].series[this.tmpKillData[1].series.length-1])
|
|
||||||
this.pointData = this.tmpPointData;
|
this.pointData = this.tmpPointData;
|
||||||
this.budgetData = this.tmpBudgetData;
|
this.budgetData = this.tmpBudgetData;
|
||||||
this.transportData = this.tmpTransportData;
|
this.transportData = this.tmpTransportData;
|
||||||
|
|
Loading…
Reference in New Issue