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

fpspreadsheet: Fix cooperation of changed TsWorkbookChartSource with TsWorkbookChartLink.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9047 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2023-11-27 18:17:22 +00:00
parent 1fce2e7f9d
commit f2ba330831
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,13 +35,13 @@ implementation
{$R *.lfm}
const
// FILE_NAME = '../../../other/chart/bars.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';
// FILE_NAME = '../../../other/chart/regression.ods';
FILE_NAME = '../../../other/chart/radar.ods';
// FILE_NAME = '../../../other/chart/radar.ods';
{ TForm1 }

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

@ -372,12 +372,26 @@ var
i: Integer;
value: Double;
begin
for i := 0 to XCount-1 do
begin
if FRanges[rngX, i] <> nil then
begin
GetXYItem(rngX, i, AIndex, value, dummyString);
FCurItem.SetX(i, value);
end else
if FCyclicX then
value := AIndex / FPointsNumber * TWO_PI
else
value := AIndex;
FCurItem.SetX(i, value);
end;
(*
if FRanges[rngX] <> nil then
begin
for i := 0 to XCount-1 do
begin
GetXYItem(rngX, i, AIndex, value, tmpLabel);
FCurItem.SetX(value);
GetXYItem(rngX, i, AIndex, value, dummyString);
FCurItem.SetX(i, value);
end;
end else
begin
@ -386,7 +400,7 @@ begin
else
FCurItem.X := AIndex;
end;
*)
for i := 0 to YCount-1 do
begin
GetXYItem(rngY, i, AIndex, value, dummyString);
@ -399,12 +413,13 @@ begin
if FCurItem.Text = '' then FCurItem.Text := tmpLabel;
end;
FCurItem.Color := clTAColor; // = clDefault
if FRanges[rngColor] <> nil then
begin
GetXYItem(rngColor, 0, AIndex, dummyNumber, dummyString);
FCurItem.Color := round(dummyNumber);
end else
FCurItem.Color := clDefault;
if not IsNaN(dummyNumber) then
FCurItem.Color := round(dummyNumber);
end;
Result := @FCurItem;
end;
@ -467,12 +482,12 @@ var
begin
ANumber := NaN;
AText := '';
{
if FRanges[ARangeIndex, AListIndex] = nil then
exit;
if FWorksheets[ARangeIndex] = nil then
exit;
}
cell := nil;
idx := 0;
@ -651,8 +666,8 @@ begin
begin
FPointsNumber := 0;
Reset;
exit;
end;
exit;
end;
// Split range string into parts for the individual xindex and yindex parts.