pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Chart link supports 100%-stacking for bar, area and line series.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9050 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-11-27 22:41:30 +00:00
parent bdd483000f
commit 2df3e382a2
3 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.lfm
View File

@ -18,6 +18,7 @@ object Form1: TForm1
PageBreakPen.Color = clBlue
PageBreakPen.Style = psDash
ReadFormulas = False
TextOverflow = True
WorkbookSource = sWorkbookSource1
Align = alLeft
AutoAdvance = aaDown

4
components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas
View File

@ -35,8 +35,8 @@ implementation
{$R *.lfm}
const
// FILE_NAME = '../../../other/chart/bars.ods';
FILE_NAME = '../../../other/chart/area.ods';
FILE_NAME = '../../../other/chart/bars.ods';
// FILE_NAME = '../../../other/chart/area.ods';
// FILE_NAME = '../../../other/chart/area-sameImg.ods';
// FILE_NAME = '../../../other/chart/pie.ods';
// FILE_NAME = '../../../other/chart/scatter.ods';

68
components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
View File

@ -22,7 +22,7 @@ uses
// LCL
LCLVersion, Forms, Controls, Graphics, GraphUtil, Dialogs,
// TAChart
TATypes, TATextElements, TAChartUtils, TALegend, TACustomSource,
TATypes, TATextElements, TAChartUtils, TALegend, TACustomSource, TASources,
TACustomSeries, TASeries, TARadialSeries, TAFitUtils, TAFuncSeries,
TAChartAxisUtils, TAChartAxis, TAStyles, TAGraph,
// FPSpreadsheet
@ -888,6 +888,7 @@ var
stackable: Boolean;
firstSeries: TChartSeries;
src: TsWorkbookChartSource;
calcSrc: TCalculatedChartSource;
style: TChartStyle;
begin
if FChart.Series.Count > 0 then
@ -901,8 +902,23 @@ begin
begin
// A stackable series in TAChart must use multiple y values.
Result := firstSeries;
// For percent-stacking we need an additional chart source, a TCalculatedChartSource
// which gets its data from the workbook chart source.
if (firstSeries.Source is TCalculatedChartSource) then
begin
calcSrc := TCalculatedChartSource(firstSeries.Source);
if (calcSrc.Origin is TsWorkbookChartSource) then
src := TsWorkbookChartSource(calcSrc.Origin);
end else
// ... otherwise we use the workbook chartsource directly.
if (firstSeries.Source is TsWorkbookChartSource) then
begin
src := (firstSeries.Source as TsWorkbookChartSource);
src.SetYRange(src.YCount, ASeries.YRange);
calcSrc := nil;
end else
raise Exception.Create('Unexpected chart source type.');
src.SetYRange(src.YCount, ASeries.YRange); // <--- This updates also the YCount
src.FRangeStr[rngY] := src.BuildRangeStr(rngY);
if Result is TBarSeries then
TBarSeries(Result).Styles := FChartStyles
@ -912,9 +928,17 @@ begin
TAreaSeries(Result).Styles := FChartStyles;
Result.Legend.Multiplicity := lmStyle;
src.SetTitleAddr(ASeries.TitleAddr);
// Trigger recalculation of YCount of the calculated chart source.
if calcSrc <> nil then
begin
calcSrc.Origin := nil;
calcSrc.Origin := src;
end;
end
else
begin
// This is either for a non-stackable or the first stackable series.
case ASeries.ChartType of
ctBar:
Result := TBarSeries.Create(FChart);
@ -933,6 +957,13 @@ begin
if not ASeries.YRange.IsEmpty then src.SetYRange(0, ASeries.YRange);
if not ASeries.FillColorRange.IsEmpty then src.SetColorRange(ASeries.FillColorRange);
src.SetTitleAddr(ASeries.TitleAddr);
if stackable then begin
calcSrc := TCalculatedChartSource.Create(self);
calcSrc.Origin := src;
Result.Source := calcSrc;
src.Reset;
end else
Result.Source := src;
Result.Title := src.Title;
end;
@ -980,7 +1011,7 @@ procedure TsWorkbookChartLink.ClearChart;
var
i, j: Integer;
ser: TChartSeries;
src: TCustomChartSource;
src, src1: TCustomChartSource;
begin
// Clear the styles
FChartStyles.Styles.Clear;
@ -995,6 +1026,13 @@ begin
begin
ser := TChartSeries(FChart.Series[i]);
src := ser.Source;
if src is TCalculatedChartSource then
begin
src1 := TCalculatedChartSource(src).Origin;
if src1 is TsWorkbookChartSource then
src1.Free;
src.Free;
end else
if src is TsWorkbookChartSource then
src.Free;
end;
@ -1287,11 +1325,9 @@ begin
UpdateChartBrush(AWorkbookSeries.Chart, AWorkbookSeries.Fill, AChartSeries.AreaBrush);
UpdateChartPen(AWorkbookSeries.Chart, AWorkbookSeries.Line, AChartSeries.AreaContourPen);
AChartSeries.AreaLinesPen.Style := psClear;
case AWorkbookSeries.Chart.StackMode of
csmSideBySide: AChartSeries.Stacked := false;
csmStacked: AChartSeries.Stacked := true;
csmStackedPercentage: AChartSeries.Stacked := true;
end;
AChartSeries.Stacked := AWorkbookSeries.Chart.StackMode <> csmSideBySide;
if AChartSeries.Source is TCalculatedChartSource then
TCalculatedChartSource(AChartSeries.Source).Percentage := (AWorkbookSeries.Chart.StackMode = csmStackedPercentage);
end;
procedure TsWorkbookChartLink.UpdateBarSeries(AWorkbookSeries: TsBarSeries;
@ -1299,11 +1335,9 @@ procedure TsWorkbookChartLink.UpdateBarSeries(AWorkbookSeries: TsBarSeries;
begin
UpdateChartBrush(AWorkbookSeries.Chart, AWorkbookSeries.Fill, AChartSeries.BarBrush);
UpdateChartPen(AWorkbookSeries.Chart, AWorkbookSeries.Line, AChartSeries.BarPen);
case AWorkbookSeries.Chart.StackMode of
csmSideBySide: AChartSeries.Stacked := false;
csmStacked: AChartSeries.Stacked := true;
csmStackedPercentage: AChartSeries.Stacked := true;
end;
AChartSeries.Stacked := AWorkbookSeries.Chart.StackMode <> csmSideBySide;
if AChartSeries.Source is TCalculatedChartSource then
TCalculatedChartSource(AChartSeries.Source).Percentage := (AWorkbookSeries.Chart.StackMode = csmStackedPercentage);
end;
procedure TsWorkbookChartLink.UpdateChart;
@ -1672,11 +1706,9 @@ begin
AChartSeries.Pointer.HorizSize := mmToPx(AWorkbookSeries.SymbolWidth, ppi);
AChartSeries.Pointer.VertSize := mmToPx(AWorkbookSeries.SymbolHeight, ppi);
end;
case AWorkbookSeries.Chart.StackMode of
csmSideBySide: AChartSeries.Stacked := false;
csmStacked: AChartSeries.Stacked := true;
csmStackedPercentage: AChartSeries.Stacked := true;
end;
AChartSeries.Stacked := AWorkbookSeries.Chart.StackMode <> csmSideBySide;
if AChartSeries.Source is TCalculatedChartSource then
TCalculatedChartSource(AChartSeries.Source).Percentage := (AWorkbookSeries.Chart.StackMode = csmStackedPercentage);
end;
procedure TsWorkbookChartLink.UpdatePieSeries(AWorkbookSeries: TsPieSeries;