paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Fix regression series crashing due to incorrectly detected error bars.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9147 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-01-16 23:22:41 +00:00
parent e8e00456d3
commit b2a57a92ae
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/fpspreadsheet/source/common/fpschart.pas
View File

@ -425,7 +425,7 @@ type
destructor Destroy; override;
end;
TsChartErrorBarKind = (cebkConstant, cebkPercentage, cebkCellRange);
TsChartErrorBarKind = (cebkNone, cebkConstant, cebkPercentage, cebkCellRange);
TsChartErrorBars = class(TsChartElement)
private
@ -443,6 +443,7 @@ type
ASheet1: String; ARow1, ACol1: Cardinal;
ASheet2: String; ARow2, ACol2: Cardinal);
procedure SetLine(AValue: TsChartLine);
procedure SetKind(AValue: TsChartErrorBarKind);
procedure SetRange(AIndex: Integer; AValue: TsChartRange);
procedure SetShow(AIndex: Integer; AValue: Boolean);
procedure SetValue(AIndex: Integer; AValue: Double);
@ -457,7 +458,7 @@ type
procedure SetErrorBarRangePos(ASheet1: String; ARow1, ACol1: Cardinal; ASheet2: String; ARow2, ACol2: Cardinal);
procedure SetErrorBarRangeNeg(ARow1, ACol1, ARow2, ACol2: Cardinal);
procedure SetErrorBarRangeNeg(ASheet1: String; ARow1, ACol1: Cardinal; ASheet2: String; ARow2, ACol2: Cardinal);
property Kind: TsChartErrorBarKind read FKind write FKind;
property Kind: TsChartErrorBarKind read FKind write SetKind;
property Line: TsChartLine read FLine write SetLine;
property RangePos: TsChartRange index 0 read GetRange write SetRange;
property RangeNeg: TsChartRange index 1 read GetRange write SetRange;
@ -1862,6 +1863,11 @@ begin
FLine.CopyFrom(AValue);
end;
procedure TsChartErrorBars.SetKind(AValue: TsChartErrorBarKind);
begin
FKind := AValue;
end;
procedure TsChartErrorBars.SetRange(AIndex: Integer; AValue: TsChartRange);
begin
FRange[AIndex].CopyFrom(AValue);

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

@ -2154,7 +2154,7 @@ procedure TsWorkbookChartLink.UpdateChartErrorBars(AWorkbookSeries: TsChartSerie
const
EPS = 1E-16;
ERRORBAR_KINDS: array[TsChartErrorBarKind] of TChartErrorBarKind = (
ebkConst, ebkPercent, ebkChartSource);
ebkNone, ebkConst, ebkPercent, ebkChartSource);
function GetChartSource(ASource: TCustomChartSource): TsWorkbookChartSource;
begin