|
@@ -29,10 +29,8 @@ class AdvancedUpdatingFeatureActivity : BasicChartActivity() {
|
|
R.id.percentStackingRadio -> stackingType = AAChartStackingType.Percent
|
|
R.id.percentStackingRadio -> stackingType = AAChartStackingType.Percent
|
|
}
|
|
}
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
- .series(
|
|
|
|
- AASeries()
|
|
|
|
- .stacking(stackingType)
|
|
|
|
- )
|
|
|
|
|
|
+ .series(AASeries()
|
|
|
|
+ .stacking(stackingType))
|
|
options = aaPlotOptions
|
|
options = aaPlotOptions
|
|
}
|
|
}
|
|
R.id.cornerStyleTypeRadioGroup -> {
|
|
R.id.cornerStyleTypeRadioGroup -> {
|
|
@@ -45,16 +43,12 @@ class AdvancedUpdatingFeatureActivity : BasicChartActivity() {
|
|
val aaPlotOptions: AAPlotOptions
|
|
val aaPlotOptions: AAPlotOptions
|
|
aaPlotOptions = if (chartType == AAChartType.Column.value) {
|
|
aaPlotOptions = if (chartType == AAChartType.Column.value) {
|
|
AAPlotOptions()
|
|
AAPlotOptions()
|
|
- .column(
|
|
|
|
- AAColumn()
|
|
|
|
- .borderRadius(borderRadius)
|
|
|
|
- )
|
|
|
|
|
|
+ .column(AAColumn()
|
|
|
|
+ .borderRadius(borderRadius))
|
|
} else {
|
|
} else {
|
|
AAPlotOptions()
|
|
AAPlotOptions()
|
|
- .bar(
|
|
|
|
- AABar()
|
|
|
|
- .borderRadius(borderRadius)
|
|
|
|
- )
|
|
|
|
|
|
+ .bar(AABar()
|
|
|
|
+ .borderRadius(borderRadius))
|
|
}
|
|
}
|
|
options = aaPlotOptions
|
|
options = aaPlotOptions
|
|
}
|
|
}
|
|
@@ -68,13 +62,9 @@ class AdvancedUpdatingFeatureActivity : BasicChartActivity() {
|
|
R.id.triangleDownSymbolRadio -> markerSymbol = AAChartSymbolType.TriangleDown
|
|
R.id.triangleDownSymbolRadio -> markerSymbol = AAChartSymbolType.TriangleDown
|
|
}
|
|
}
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
- .series(
|
|
|
|
- AASeries()
|
|
|
|
- .marker(
|
|
|
|
- AAMarker()
|
|
|
|
- .symbol(markerSymbol.value)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .series(AASeries()
|
|
|
|
+ .marker(AAMarker()
|
|
|
|
+ .symbol(markerSymbol.value)))
|
|
options = aaPlotOptions
|
|
options = aaPlotOptions
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -119,61 +109,41 @@ class AdvancedUpdatingFeatureActivity : BasicChartActivity() {
|
|
options = if (this.aaChartModel.polar == true) {
|
|
options = if (this.aaChartModel.polar == true) {
|
|
AAOptions()
|
|
AAOptions()
|
|
.chart(aaChart)
|
|
.chart(aaChart)
|
|
- .plotOptions(
|
|
|
|
- AAPlotOptions()
|
|
|
|
- .column(
|
|
|
|
- AAColumn()
|
|
|
|
|
|
+ .plotOptions(AAPlotOptions()
|
|
|
|
+ .column(AAColumn()
|
|
.pointPadding(0f)
|
|
.pointPadding(0f)
|
|
- .groupPadding(0.005f)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .groupPadding(0.005f)))
|
|
} else {
|
|
} else {
|
|
AAOptions()
|
|
AAOptions()
|
|
.chart(aaChart)
|
|
.chart(aaChart)
|
|
- .plotOptions(
|
|
|
|
- AAPlotOptions()
|
|
|
|
- .column(
|
|
|
|
- AAColumn()
|
|
|
|
|
|
+ .plotOptions(AAPlotOptions()
|
|
|
|
+ .column(AAColumn()
|
|
.pointPadding(0.1f)
|
|
.pointPadding(0.1f)
|
|
- .groupPadding(0.2f)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .groupPadding(0.2f)))
|
|
}
|
|
}
|
|
} else if (this.aaChartModel.chartType == AAChartType.Bar) {
|
|
} else if (this.aaChartModel.chartType == AAChartType.Bar) {
|
|
options = if (this.aaChartModel.polar == true) {
|
|
options = if (this.aaChartModel.polar == true) {
|
|
AAOptions()
|
|
AAOptions()
|
|
.chart(aaChart)
|
|
.chart(aaChart)
|
|
- .plotOptions(
|
|
|
|
- AAPlotOptions()
|
|
|
|
- .bar(
|
|
|
|
- AABar()
|
|
|
|
|
|
+ .plotOptions(AAPlotOptions()
|
|
|
|
+ .bar(AABar()
|
|
.pointPadding(0f)
|
|
.pointPadding(0f)
|
|
- .groupPadding(0.005f)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .groupPadding(0.005f)))
|
|
} else {
|
|
} else {
|
|
AAOptions()
|
|
AAOptions()
|
|
.chart(aaChart)
|
|
.chart(aaChart)
|
|
- .plotOptions(
|
|
|
|
- AAPlotOptions()
|
|
|
|
- .bar(
|
|
|
|
- AABar()
|
|
|
|
|
|
+ .plotOptions(AAPlotOptions()
|
|
|
|
+ .bar(AABar()
|
|
.pointPadding(0.1f)
|
|
.pointPadding(0.1f)
|
|
- .groupPadding(0.2f)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .groupPadding(0.2f)))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
R.id.dataShowSwitch -> {
|
|
R.id.dataShowSwitch -> {
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
- .series(
|
|
|
|
- AASeries()
|
|
|
|
- .dataLabels(
|
|
|
|
- AADataLabels()
|
|
|
|
- .enabled(isChecked)
|
|
|
|
- )
|
|
|
|
- )
|
|
|
|
|
|
+ .series(AASeries()
|
|
|
|
+ .dataLabels(AADataLabels()
|
|
|
|
+ .enabled(isChecked)))
|
|
options = aaPlotOptions
|
|
options = aaPlotOptions
|
|
}
|
|
}
|
|
R.id.markerHideSwitch -> {
|
|
R.id.markerHideSwitch -> {
|
|
@@ -184,10 +154,8 @@ class AdvancedUpdatingFeatureActivity : BasicChartActivity() {
|
|
.enabled(true)
|
|
.enabled(true)
|
|
.radius(6f)
|
|
.radius(6f)
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
val aaPlotOptions: AAPlotOptions = AAPlotOptions()
|
|
- .series(
|
|
|
|
- AASeries()
|
|
|
|
- .marker(aaMarker)
|
|
|
|
- )
|
|
|
|
|
|
+ .series(AASeries()
|
|
|
|
+ .marker(aaMarker))
|
|
options = aaPlotOptions
|
|
options = aaPlotOptions
|
|
}
|
|
}
|
|
}
|
|
}
|