From 16a789dcb598de6f6c8acfd820d31046fd28fd0f Mon Sep 17 00:00:00 2001
From: wp <wp.no-reply@lazarus-ide-org>
Date: Thu, 2 Mar 2017 21:09:39 +0000
Subject: [PATCH] TAChart: Some refinements of datapointtools demo.

git-svn-id: trunk@54326 -
---
 .../tachart/demo/datapointtools/main.lfm      |  2 +-
 .../tachart/demo/datapointtools/main.pas      | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/components/tachart/demo/datapointtools/main.lfm b/components/tachart/demo/datapointtools/main.lfm
index 8b2779c0b5..6feb8912bd 100644
--- a/components/tachart/demo/datapointtools/main.lfm
+++ b/components/tachart/demo/datapointtools/main.lfm
@@ -15,7 +15,7 @@ object MainForm: TMainForm
     Width = 637
     MultiLine = True
     OnChange = TabControlChange
-    TabIndex = 9
+    TabIndex = 0
     Tabs.Strings = (
       'Line series'
       'Bar series'
diff --git a/components/tachart/demo/datapointtools/main.pas b/components/tachart/demo/datapointtools/main.pas
index 066d95c500..0340415310 100644
--- a/components/tachart/demo/datapointtools/main.pas
+++ b/components/tachart/demo/datapointtools/main.pas
@@ -5,9 +5,10 @@ unit main;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, TAGraph, TASeries, TATools, TAStyles, TASources,
-  Forms, Controls, Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls,
-  TAChartUtils, TAMultiSeries, TARadialSeries, TAFuncSeries, Types;
+  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
+  ExtCtrls, StdCtrls, Types,
+  TAGraph, TASeries, TATools, TAStyles, TASources,  TAChartUtils, TAMultiSeries,
+  TARadialSeries, TAFuncSeries, TACustomSeries, TADrawUtils;
 
 type
 
@@ -74,9 +75,6 @@ implementation
 
 {$R *.lfm}
 
-uses
-  TACustomSeries;
-
 { TMainForm }
 
 procedure TMainForm.CbCandleStickChange(Sender: TObject);
@@ -135,7 +133,7 @@ procedure TMainForm.DataPointDragToolDragXY(ASender: TDataPointDragTool;
 var
   ser: TChartSeries;
 begin
-  if ASender.YIndex > 0 then begin
+  if (ASender.YIndex > 0) and (ASender.Series is TChartSeries) then begin
     ser := TChartSeries(ASender.Series);
     ser.XValue[ASender.PointIndex] := AGraphPoint.X;
   end;
@@ -317,11 +315,15 @@ begin
     if BarSeries.Active then
       s := s + LineEnding + 'Grab the bars at their upper ends.';
   end else
-  if FieldSeries.Active then begin
+  if FieldSeries.Active then
     s := 'Rotate an arrow by grabbing it at its ends.' + LineEnding +
       'Shift it by grabbing it in the middle.' + LineEnding +
-      'The checkbox "Drag both x and y" is not operating here.';
-  end;
+      'The checkbox "Drag both x and y" is not operating here.'
+  else
+  if BubbleSeries.Active then
+    s := 'Grab a bubble at its perimeter to change the radius.' + LineEnding +
+      'Grab it in the center to change its location.' + LineEnding +
+      'Overlapping bubbles may be detected erroneously.';
   if s <> '' then
     LblNOTE.Caption := 'NOTE:' + LineEnding + s;
   LblNote.Visible := (s <> '');