paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-25 18:09:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: BarSeries accepts tool hits along upper bar border (not just at center of bar border).

Browse Source 
git-svn-id: trunk@53932 -
This commit is contained in:
wp 2017-01-12 14:05:35 +00:00
parent 84f6fb1761
commit fa280dc697
2 changed files with 67 additions and 16 deletions

47
components/tachart/tacustomseries.pas
View File

@ -267,6 +267,7 @@ type
FStacked: Boolean;
FUpBound: Integer;
FUseReticule: Boolean;
FOptimizeX: Boolean;
procedure AfterDrawPointer(
ADrawer: IChartDrawer; AIndex: Integer; const APos: TPoint); virtual;
@ -281,6 +282,8 @@ type
function NearestXNumber(var AIndex: Integer; ADir: Integer): Double;
procedure PrepareGraphPoints(
const AExtent: TDoubleRect; AFilterByExtent: Boolean);
function ToolTargetDistance(const AParams: TNearestPointParams;
APoint: TDoublePoint; APointIndex: Integer): Integer; virtual;
procedure UpdateGraphPoints(AIndex: Integer; ACumulative: Boolean); overload; inline;
procedure UpdateGraphPoints(AIndex, ALo, AUp: Integer; ACumulative: Boolean); overload;
procedure UpdateMinXRange;
@ -296,6 +299,7 @@ type
read FOnGetPointerStyle write FOnGetPointerStyle;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
public
procedure Assign(ASource: TPersistent); override;
@ -1075,6 +1079,12 @@ begin
inherited Assign(ASource);
end;
constructor TBasicPointSeries.Create(AOwner: TComponent);
begin
inherited;
FOptimizeX := true;
end;
destructor TBasicPointSeries.Destroy;
begin
FreeAndNil(FPointer);
@ -1268,17 +1278,16 @@ function TBasicPointSeries.GetNearestPoint(
var
dist, i, j, lb, ub: Integer;
pt: TPoint;
sp: TDoublePoint;
tmpPt: TPoint;
tmpSP: TDoublePoint;
tmpDist: Integer;
begin
AResults.FDist := Sqr(AParams.FRadius) + 1;
AResults.FDist := Sqr(AParams.FRadius) + 1; // the dist func does not calc sqrt
AResults.FIndex := -1;
AResults.FXIndex := 0;
AResults.FYIndex := 0;
if AParams.FOptimizeX then
if FOptimizeX and AParams.FOptimizeX then
Source.FindBounds(
GetGrabBound(-AParams.FRadius),
GetGrabBound( AParams.FRadius), lb, ub)
@ -1287,6 +1296,7 @@ begin
ub := Count - 1;
end;
dist := AResults.FDist;
for i := lb to ub do begin
sp := Source[i]^.Point;
if IsNan(sp) then
@ -1297,41 +1307,35 @@ begin
// an integer overflow, so ADistFunc should use saturation arithmetics.
// Find nearest point of datapoint at (x, y)
if (nptPoint in AParams.FTargets) then begin
pt := ParentChart.GraphToImage(AxisToGraph(sp));
dist := AParams.FDistFunc(AParams.FPoint, pt);
end;
if (nptPoint in AParams.FTargets) then
dist := Min(dist, ToolTargetDistance(AParams, sp, i));
// Find nearest point to additional y values (at x).
// In case of stacked data points check the stacked values.
if (nptYList in AParams.FTargets) then begin
if (nptYList in AParams.FTargets) and (dist > 0) then begin
tmpSp := sp;
for j := 0 to Source.YCount - 2 do begin
if FStacked then
tmpSp.Y += Source[i]^.YList[j] else
tmpSp.Y := Source[i]^.YList[j];
tmpPt := ParentChart.GraphToImage(AxisToGraph(tmpSp));
tmpDist := AParams.FDistFunc(AParams.FPoint, tmpPt);
tmpDist := ToolTargetDistance(AParams, tmpSp, i);
if tmpDist < dist then begin
dist := tmpDist;
sp := tmpSp;
pt := tmpPt;
AResults.FYIndex := j + 1; // FYIndex = 0 refers to the regular y
end;
end;
end;
// Find nearest point of additional x values (at y)
if (nptXList in AParams.FTargets) then begin
if (nptXList in AParams.FTargets) and (dist > 0) then begin
tmpSp := sp;
for j := 0 to Source.XCount - 2 do begin
tmpSp.X := Source[i]^.XList[j];
tmpPt := parentChart.GraphToImage(AxisToGraph(tmpSp));
tmpDist := AParams.FDistFunc(AParams.FPoint, tmpPt);
tmpDist := ToolTargetDistance(AParams, tmpSp, i);
if tmpDist < dist then begin
dist := tmpDist;
sp := tmpSp;
pt := tmpPt;
AResults.FXIndex := j + 1; // FXindex = 0 refers to the regular x
end;
end;
@ -1345,8 +1349,9 @@ begin
AResults.FDist := dist;
AResults.FIndex := i;
AResults.FImg := pt;
AResults.FValue := sp;
AResults.FImg := ParentChart.GraphToImage(AxisToGraph(sp));
if dist = 0 then break;
end;
Result := AResults.FIndex >= 0;
end;
@ -1438,6 +1443,16 @@ begin
UpdateParentChart;
end;
function TBasicPointSeries.ToolTargetDistance(const AParams: TNearestPointParams;
APoint: TDoublePoint; APointIndex: Integer): Integer;
var
pt: TPoint;
begin
Unused(APointIndex);
pt := ParentChart.GraphToImage(AxisToGraph(APoint));
Result := AParams.FDistFunc(AParams.FPoint, pt);
end;
procedure TBasicPointSeries.UpdateGraphPoints(AIndex, ALo, AUp: Integer;
ACumulative: Boolean);
var

36
components/tachart/taseries.pas
View File

@ -64,6 +64,8 @@ type
procedure SetZeroLevel(AValue: Double);
strict protected
function GetLabelDataPoint(AIndex: Integer): TDoublePoint; override;
function ToolTargetDistance(const AParams: TNearestPointParams;
APoint: TDoublePoint; APointIndex: Integer): Integer; override;
protected
procedure BarOffsetWidth(
AX: Double; AIndex: Integer; out AOffset, AWidth: Double);
@ -957,6 +959,7 @@ begin
FBarBrush.Color := clRed;
FStacked := true;
FOptimizeX := false;
end;
destructor TBarSeries.Destroy;
@ -1263,6 +1266,39 @@ begin
UpdateParentChart;
end;
function TBarSeries.ToolTargetDistance(const AParams: TNearestPointParams;
APoint: TDoublePoint; APointIndex: Integer): Integer;
var
spt: TDoublePoint;
tpt, pt1, pt2: TPoint;
ofs, w: Double;
dist1, dist2: Integer;
begin
BarOffsetWidth(APoint.X, APointIndex, ofs, w);
spt := DoublePoint(APoint.X + ofs - w, APoint.Y);
pt1 := ParentChart.GraphToImage(AxisToGraph(spt));
spt := DoublePoint(APoint.X + ofs + w, APoint.Y);
pt2 := ParentChart.GraphToImage(AxisToGraph(spt));
tpt := AParams.FPoint;
if IsRotated then begin
Exchange(pt1.X, pt1.Y);
Exchange(pt2.X, pt2.Y);
Exchange(tpt.X, tpt.Y);
end;
if pt2.X < pt1.x then Exchange(pt2.X, pt1.X);
if InRange(tpt.X, pt1.x, pt2.x) then
Result := sqr(tpt.Y - pt1.Y) // DistFunc does not calculate sqrt!
else begin
dist1 := AParams.FDistFunc(tpt, pt1);
dist2 := AParams.FDistFunc(tpt, pt2);
Result := Min(dist1, dist2);
end;
end;
{ TAreaSeries }
procedure TAreaSeries.Assign(ASource: TPersistent);