Skip to content

Commit

Permalink
Chart Data Label Bug Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@DraviaVemal
DraviaVemal committed Apr 17, 2024
1 parent 6af5d9a commit 9557b9b
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<LangVersion>5.0</LangVersion>
<OutputPath>..\bin\</OutputPath>
<Authors>DraviaVemal</Authors>
<Version>2.6.14</Version>
<Version>2.6.15</Version>
<Company>DraviaVemal</Company>
<Copyright>Copyright (c) 2023 DraviaVemal
Permission is hereby granted, free of charge, to any person obtaining a copy of this
Expand Down
9 changes: 7 additions & 2 deletions Global/Components/Charts/2007/AreaChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,13 @@ private C.AreaChartSeries CreateAreaChartSeries(int seriesIndex, ChartDataGroupi
solidFill = GetSeriesBorderColor(seriesIndex, chartDataGrouping)
}
};
C.DataLabels dataLabels = seriesIndex < areaChartSetting.areaChartSeriesSettings.Count ?
CreateAreaDataLabels(areaChartSetting.areaChartSeriesSettings.ElementAtOrDefault(seriesIndex).areaChartDataLabel ?? new AreaChartDataLabel(), chartDataGrouping.dataLabelCells.Length) : null;
C.DataLabels dataLabels = null;
if (seriesIndex < areaChartSetting.areaChartSeriesSettings.Count)
{
AreaChartDataLabel areaChartDataLabel = areaChartSetting.areaChartSeriesSettings.ElementAtOrDefault(seriesIndex) != null ? areaChartSetting.areaChartSeriesSettings.ElementAtOrDefault(seriesIndex).areaChartDataLabel : null;
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateAreaDataLabels(areaChartDataLabel ?? new AreaChartDataLabel(), dataLabelCellsLength);
}
C.AreaChartSeries series = new C.AreaChartSeries(
new C.Index { Val = new UInt32Value((uint)chartDataGrouping.id) },
new C.Order { Val = new UInt32Value((uint)chartDataGrouping.id) },
Expand Down
2 changes: 1 addition & 1 deletion Global/Components/Charts/2007/BarChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ private C.BarChartSeries CreateBarChartSeries(int seriesIndex, ChartDataGrouping
C.DataLabels dataLabels = null;
if (seriesIndex < barChartSetting.barChartSeriesSettings.Count)
{
BarChartDataLabel barChartDataLabel = barChartSetting.barChartSeriesSettings.ElementAtOrDefault(seriesIndex).barChartDataLabel;
BarChartDataLabel barChartDataLabel = barChartSetting.barChartSeriesSettings.ElementAtOrDefault(seriesIndex) != null ? barChartSetting.barChartSeriesSettings.ElementAtOrDefault(seriesIndex).barChartDataLabel : null;
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateBarDataLabels(barChartDataLabel ?? new BarChartDataLabel(), dataLabelCellsLength);
}
Expand Down
8 changes: 2 additions & 6 deletions Global/Components/Charts/2007/ColumnChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,12 @@ private C.BarChartSeries CreateColumnChartSeries(int seriesIndex, ChartDataGroup
solidFill = GetSeriesBorderColor(seriesIndex, chartDataGrouping),
}
};
int? labelCounter = null;
if (chartDataGrouping.dataLabelCells != null)
{
labelCounter = chartDataGrouping.dataLabelCells.Length;
}
C.DataLabels dataLabels = null;
if (seriesIndex < columnChartSetting.columnChartSeriesSettings.Count)
{
ColumnChartDataLabel columnChartDataLabel = columnChartSetting.columnChartSeriesSettings.ElementAtOrDefault(seriesIndex) != null ? columnChartSetting.columnChartSeriesSettings.ElementAtOrDefault(seriesIndex).columnChartDataLabel : null;
dataLabels = CreateColumnDataLabels(columnChartDataLabel ?? new ColumnChartDataLabel(), labelCounter);
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateColumnDataLabels(columnChartDataLabel ?? new ColumnChartDataLabel(), dataLabelCellsLength);
}
C.BarChartSeries series = new C.BarChartSeries(
new C.Index { Val = new UInt32Value((uint)chartDataGrouping.id) },
Expand Down
9 changes: 5 additions & 4 deletions Global/Components/Charts/2007/LineChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,13 @@ private C.LineChartSeries CreateLineChartSeries(int seriesIndex, ChartDataGroupi
}
LineChartSeriesSetting lineChartSeriesSetting = lineChartSetting.lineChartSeriesSettings.ElementAtOrDefault(seriesIndex);
C.DataLabels dataLabels = null;
if (lineChartSeriesSetting != null && lineChartSeriesSetting.lineChartDataLabel != null)
if (seriesIndex < lineChartSetting.lineChartSeriesSettings.Count)
{
int labelCount = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateLineDataLabels(lineChartSeriesSetting.lineChartDataLabel, labelCount);
LineChartDataLabel lineChartDataLabel = lineChartSeriesSetting != null ? lineChartSeriesSetting.lineChartDataLabel : null;
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateLineDataLabels(lineChartDataLabel ?? new LineChartDataLabel(), dataLabelCellsLength);
}
var lineChartLineFormat = lineChartSeriesSetting != null ? lineChartSeriesSetting.lineChartLineFormat : null;
LineChartLineFormat lineChartLineFormat = lineChartSeriesSetting != null ? lineChartSeriesSetting.lineChartLineFormat : null;
OutlineModel outlineModel = new OutlineModel()
{
solidFill = GetBorderColor(seriesIndex, chartDataGrouping, lineChartLineFormat),
Expand Down
9 changes: 7 additions & 2 deletions Global/Components/Charts/2007/PieChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,13 @@ private SolidFillModel GetDataPointBorder(uint index, int seriesIndex)
}
private C.PieChartSeries CreateChartSeries(int seriesIndex, ChartDataGrouping chartDataGrouping)
{
C.DataLabels dataLabels = seriesIndex < pieChartSetting.pieChartSeriesSettings.Count ?
CreatePieDataLabels(pieChartSetting.pieChartSeriesSettings.ElementAtOrDefault(seriesIndex).pieChartDataLabel ?? new PieChartDataLabel(), chartDataGrouping.dataLabelCells.Length) : null;
C.DataLabels dataLabels = null;
if (seriesIndex < pieChartSetting.pieChartSeriesSettings.Count)
{
PieChartDataLabel pieChartDataLabel1 = pieChartSetting.pieChartSeriesSettings.ElementAtOrDefault(seriesIndex) != null ? pieChartSetting.pieChartSeriesSettings.ElementAtOrDefault(seriesIndex).pieChartDataLabel : null;
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreatePieDataLabels(pieChartDataLabel1 ?? new PieChartDataLabel(), dataLabelCellsLength);
}
C.PieChartSeries series = new C.PieChartSeries(
new C.Index { Val = new UInt32Value((uint)chartDataGrouping.id) },
new C.Order { Val = new UInt32Value((uint)chartDataGrouping.id) },
Expand Down
9 changes: 7 additions & 2 deletions Global/Components/Charts/2007/ScatterChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,13 @@ private SolidFillModel GetSeriesBorderColor(int seriesIndex, ChartDataGrouping c
}
private C.ScatterChartSeries CreateScatterChartSeries(int seriesIndex, ChartDataGrouping chartDataGrouping)
{
C.DataLabels dataLabels = seriesIndex < scatterChartSetting.scatterChartSeriesSettings.Count ?
CreateScatterDataLabels(scatterChartSetting.scatterChartSeriesSettings.ElementAtOrDefault(seriesIndex).scatterChartDataLabel ?? new ScatterChartDataLabel(), chartDataGrouping.dataLabelCells.Length) : null;
C.DataLabels dataLabels = null;
if (seriesIndex < scatterChartSetting.scatterChartSeriesSettings.Count)
{
ScatterChartDataLabel scatterChartDataLabel = scatterChartSetting.scatterChartSeriesSettings.ElementAtOrDefault(seriesIndex) != null ? scatterChartSetting.scatterChartSeriesSettings.ElementAtOrDefault(seriesIndex).scatterChartDataLabel : null;
int dataLabelCellsLength = chartDataGrouping.dataLabelCells != null ? chartDataGrouping.dataLabelCells.Length : 0;
dataLabels = CreateScatterDataLabels(scatterChartDataLabel ?? new ScatterChartDataLabel(), dataLabelCellsLength);
}
MarkerModel markerModel = new MarkerModel();
if (new[] { ScatterChartTypes.SCATTER, ScatterChartTypes.SCATTER_SMOOTH_MARKER, ScatterChartTypes.SCATTER_STRIGHT_MARKER }.Contains(scatterChartSetting.scatterChartType))
{
Expand Down

0 comments on commit 9557b9b

Please sign in to comment.