Skip to content

Commit 044c03b

Browse files
authored
completed (#344)
1 parent bc8299c commit 044c03b

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

src/app/widget-config/chart-options/chart-options.component.ts

-17
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ export class ChartOptionsComponent implements OnInit {
5050
) { }
5151

5252
ngOnInit(): void {
53-
if (this.startScaleAtZero.value) {
54-
this.showDatasetMinimumValueLine.disable();
55-
this.showDatasetMaximumValueLine.disable();
56-
}
57-
5853
if (!this.showAverageData.value) {
5954
this.trackAgainstAverage.disable();
6055
}
@@ -80,18 +75,6 @@ export class ChartOptionsComponent implements OnInit {
8075
this.setValueScaleOptionsControls(e.value);
8176
}
8277

83-
public disableMinMaxLines(e: MatCheckboxChange): void {
84-
if (e.checked) {
85-
this.showDatasetMinimumValueLine.setValue(!e.checked);
86-
this.showDatasetMaximumValueLine.setValue(!e.checked);
87-
this.showDatasetMinimumValueLine.disable();
88-
this.showDatasetMaximumValueLine.disable();
89-
} else {
90-
this.showDatasetMinimumValueLine.enable();
91-
this.showDatasetMaximumValueLine.enable();
92-
}
93-
}
94-
9578
public enableTrackAgainstMovingAverage(e: MatCheckboxChange): void {
9679
if (e.checked) {
9780
this.trackAgainstAverage.enable();

src/app/widgets/widget-data-chart/widget-data-chart.component.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class WidgetDataChartComponent extends BaseWidgetComponent implements OnI
9696
showDatasetAngleAverageValueLine: false,
9797
showLabel: false,
9898
showTimeScale: false,
99-
startScaleAtZero: true,
99+
startScaleAtZero: false,
100100
verticalGraph: false,
101101
showYScale: false,
102102
yScaleSuggestedMin: null,
@@ -204,17 +204,22 @@ export class WidgetDataChartComponent extends BaseWidgetComponent implements OnI
204204
suggestedMax: this.widgetProperties.config.enableMinMaxScaleLimit ? null : this.widgetProperties.config.yScaleSuggestedMax,
205205
min: this.widgetProperties.config.enableMinMaxScaleLimit ? this.widgetProperties.config.yScaleMin : null,
206206
max: this.widgetProperties.config.enableMinMaxScaleLimit ? this.widgetProperties.config.yScaleMax : null,
207-
grace: "5%",
207+
beginAtZero: this.widgetProperties.config.startScaleAtZero,
208+
// grace: "5%",
208209
title: {
209210
display: false,
210211
text: "Value Axis",
211212
align: "center"
212213
},
213214
ticks: {
214-
maxTicksLimit: 6
215+
maxTicksLimit: 8,
216+
precision: this.widgetProperties.config.numDecimal,
217+
major: {
218+
enabled: true,
219+
}
215220
},
216221
grid: {
217-
display: true
222+
display: true,
218223
}
219224
}
220225
}
@@ -252,7 +257,7 @@ export class WidgetDataChartComponent extends BaseWidgetComponent implements OnI
252257
minimumLine: {
253258
type: 'line',
254259
scaleID: 'y',
255-
display: this.widgetProperties.config.startScaleAtZero ? false : this.widgetProperties.config.showDatasetMinimumValueLine,
260+
display: this.widgetProperties.config.showDatasetMinimumValueLine,
256261
value: null,
257262
drawTime: 'afterDatasetsDraw',
258263
label: {

0 commit comments

Comments
 (0)