From 2c6fbd54c52bae008d01a1a97ec066344a4beb53 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 27 Nov 2023 18:17:22 +0000
Subject: [PATCH] fpspreadsheet: Fix cooperation of changed
 TsWorkbookChartSource with TsWorkbookChartLink.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9047 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../visual/fpschart/fpschartlink/main.pas     |  4 +--
 .../source/visual/fpspreadsheetchart.pas      | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas b/components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas
index 71e34740e..7fb91b4fe 100644
--- a/components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas
+++ b/components/fpspreadsheet/examples/visual/fpschart/fpschartlink/main.pas
@@ -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 }
 
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
index 3ce2d6af4..5b392f709 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetchart.pas
@@ -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.