paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-09 19:57:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Undo 60021, 60027, 60057, 60058, 60059, 60060, 60065, 60066

Browse Source 
git-svn-id: trunk@60068 -
This commit is contained in:
wp 2019-01-13 00:18:44 +00:00
parent 84a9df69ff
commit 6fbf3f209a
2 changed files with 68 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
components/tachart/tacustomseries.pas
View File

@ -262,7 +262,7 @@ type
FOnCustomDrawPointer: TSeriesPointerCustomDrawEvent;
FOnGetPointerStyle: TSeriesPointerStyleEvent;
function GetErrorBars(AIndex: Integer): TChartErrorBar;
function GetLabelDirection(AValue: Double): TLabelDirection;
function GetLabelDirection(AIndex: Integer): TLabelDirection;
function IsErrorBarsStored(AIndex: Integer): Boolean;
procedure SetErrorBars(AIndex: Integer; AValue: TChartErrorBar);
procedure SetMarkPositions(AValue: TLinearMarkPositions);
@ -287,7 +287,11 @@ type
UseDataColors: Boolean = false);
procedure FindExtentInterval(
const AExtent: TDoubleRect; AFilterByExtent: Boolean);
function GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint; virtual;
{
function GetErrorBars(APointIndex: Integer; IsXError: Boolean;
out AGraphPointPos, AGraphPointNeg: Double): Boolean;
}
function GetLabelDataPoint(AIndex: Integer): TDoublePoint; virtual;
procedure GetLegendItemsRect(AItems: TChartLegendItems; ABrush: TBrush);
function GetXRange(AX: Double; AIndex: Integer): Double;
function GetZeroLevel: Double; virtual;
@ -1238,13 +1242,12 @@ var
end;
var
y, ysum: Double;
y: Double;
g, gl: TDoublePoint;
i, si: Integer;
ld: TLabelDirection;
style: TChartStyle;
lfont: TFont;
curr, prev: Double;
begin
if not Marks.IsMarkLabelsVisible then exit;
@ -1253,11 +1256,10 @@ begin
lfont.Assign(Marks.LabelFont);
ParentChart.DisableRedrawing;
for i := FLoBound to FUpBound do begin
if IsNaN(Source[i]^.Point) then continue;
y := Source[i]^.Y;
ysum := y;
prev := GetZeroLevel;
for i := 0 to Count - 1 do begin
if IsNan(Source[i]^.Point) then continue;
g := GetLabelDataPoint(i);
ld := GetLabelDirection(i);
for si := 0 to Source.YCount - 1 do begin
if Styles <> nil then begin
style := Styles.StyleByIndex(si);
@ -1266,35 +1268,28 @@ begin
else
Marks.LabelFont.Assign(lfont);
end;
g := GetLabelDataPoint(i, si);
if si > 0 then begin
if not Stacked then
g := GetGraphPoint(i, 0, si)
else
if si = 0 then
y := Source[i]^.y - GetZeroLevel
else begin
y := Source[i]^.YList[si-1];
if Stacked then begin
ysum := ysum + y;
y := ysum;
end;
end;
if not IsNaN(y) then begin
if IsRotated then
g.X := AxisToGraphX(y)
g.X += AxisToGraphY(y)
else
g.Y := AxisToGraphY(y);
g.Y += AxisToGraphY(y);
end;
curr := TDoublePointBoolArr(g)[not IsRotated];
if MarkPositions = lmpInsideCenter then begin
gl := g;
if FMarkPositions = lmpInsideCenter then begin
if IsRotated then
gl := DoublePoint((curr + prev) * 0.5, g.y)
gl.X -= AxisToGraphX(y)/2
else
gl := DoublePoint(g.X, (curr + prev) * 0.5);
end else
gl := g;
prev := curr;
ld := GetLabelDirection(TDoublePointBoolArr(gl)[not IsRotated]);
gl.Y -= AxisToGraphY(y)/2;
end;
with ParentChart do
if
((Marks.YIndex = MARKS_YINDEX_ALL) or (Marks.YIndex = si)) and
(Marks.YIndex = MARKS_YINDEX_ALL) or (Marks.YIndex = si) and
IsPointInViewPort(gl)
then
DrawLabel(FormattedMark(i, '', si), GraphToImage(gl), ld);
@ -1387,30 +1382,24 @@ begin
Result := FErrorBars[AIndex];
end;
function TBasicPointSeries.GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint;
function TBasicPointSeries.GetLabelDataPoint(AIndex: Integer): TDoublePoint;
begin
Result := GetGraphPoint(AIndex);
end;
function TBasicPointSeries.GetLabelDirection(AValue: Double): TLabelDirection;
function TBasicPointSeries.GetLabelDirection(AIndex: Integer): TLabelDirection;
const
DIR: array [Boolean, Boolean] of TLabelDirection =
((ldTop, ldBottom), (ldRight, ldLeft));
var
isNeg: Boolean;
ref: Double;
begin
if Stacked then
ref := GetZeroLevel
else
with FChart.LogicalExtent do
ref := IfThen(IsRotated, a.x + b.x, a.y + b.y) * 0.5;
case MarkPositions of
lmpOutside: isNeg := AValue < ref;
lmpOutside: isNeg := Source[AIndex]^.Y < GetZeroLevel;
lmpPositive: isNeg := false;
lmpNegative: isNeg := true;
lmpInside: isNeg := AValue >= ref;
lmpInsideCenter: isNeg := false;
lmpInside: isNeg := Source[AIndex]^.Y >= GetZeroLevel;
lmpInsideCenter: isNeg := Source[AIndex]^.Y < GetZeroLevel;
end;
Result := DIR[IsRotated, isNeg];
end;
@ -1740,91 +1729,50 @@ end;
procedure TBasicPointSeries.UpdateMargins(
ADrawer: IChartDrawer; var AMargins: TRect);
var
i, j: Integer;
i, dist: Integer;
labelText: String;
dir: TLabelDirection;
ap: TDoublePoint;
m: array [TLabelDirection] of Integer absolute AMargins;
zero: Double;
gp: TDoublePoint;
p: TPoint;
dist: TPoint;
prev, curr, zero: Integer;
r, rExtent: TRect;
y, ysum: Double;
valueIsPositive: Boolean;
begin
if not Marks.IsMarkLabelsVisible or not Marks.AutoMargins then exit;
if MarkPositions = lmpInsideCenter then exit;
with FChart.LogicalExtent do begin
rExtent.TopLeft := FChart.GraphToImage(DoublePoint(a.x, b.y));
rExtent.BottomRight := FChart.GraphToImage(DoublePoint(b.x, a.y));
end;
r := rExtent;
with FChart do
zero := IfThen(IsRotated, XGraphToImage(GetZeroLevel), YGraphToImage(GetZeroLevel));
for i := FLoBound to FUpBound do begin
zero := GetZeroLevel;
for i := 0 to Count - 1 do begin
gp := GetGraphPoint(i);
if not ParentChart.IsPointInViewPort(gp) then continue;
labelText := FormattedMark(i);
if labelText = '' then Continue;
if labelText = '' then continue;
ap := Source[i]^.Point;
if IsNaN(ap.X) then
Continue;
valueIsPositive := TDoublePointBoolArr(gp)[not IsRotated] > zero;
dir := GetLabelDirection(i);
with Marks.MeasureLabel(ADrawer, labelText) do
if IsRotated then
dist := Point(cx + Marks.Distance - IfThen(Marks.DistanceToCenter, cx div 2), cy div 2)
else
dist := Point(cx div 2, cy + Marks.Distance - IfThen(Marks.DistanceToCenter, cy div 2));
dist := IfThen(dir in [ldLeft, ldRight], cx, cy);
if Marks.DistanceToCenter then
dist := dist div 2;
prev := zero;
y := ap.Y;
ysum := y;
for j := 0 to Source.YCount - 1 do begin
gp := GetLabelDataPoint(i, j);
if (j > 0) then begin
y := Source[i]^.YList[j-1];
if Stacked and not IsNaN(y) then begin
if IsNaN(ysum) then ysum := y else ysum := ysum + y;
y := ysum;
end;
end;
if IsRotated then
gp.x := AxisToGraphX(y)
else
gp.y := AxisToGraphY(y);
p := FChart.GraphToImage(gp);
curr := TPointBoolArr(p)[not IsRotated];
if MarkPositions = lmpInsideCenter then begin
if IsRotated then
p.x := (curr + prev) div 2
else
p.y := (curr + prev) div 2;
end;
gp := FChart.ImageToGraph(p);
if FChart.IsPointInViewPort(gp) then begin
dir := GetlabelDirection(TDoublePointBoolArr(gp)[not IsRotated]);
if valueIsPositive then begin
if Marks.DistanceToCenter then
case dir of
ldLeft : UpdateMinMax(p.X - dist.X, r.Left, r.Right);
ldRight : UpdateMinMax(p.X + dist.X, r.Left, r.Right);
ldTop : UpdateMinMax(p.Y - dist.Y, r.Top, r.Bottom);
ldBottom : UpdateMinMax(p.Y + dist.Y, r.Top, r.Bottom);
ldBottom: dir := ldTop;
ldLeft: dir := ldRight;
end;
end;
prev := curr;
end;
if IsRotated then begin
UpdateMinMax(p.Y - dist.Y, r.Top, r.Bottom);
UpdateMinMax(p.Y + dist.Y, r.Top, r.Bottom);
if dir in [ldTop, ldRight] then
m[dir] := Max(m[dir], dist + Marks.Distance);
end else begin
UpdateMinMax(p.X - dist.X, r.Left, r.Right);
UpdateMinMax(p.X + dist.X, r.Left, r.Right);
if Marks.DistanceToCenter then
case dir of
ldTop: dir := ldBottom;
ldRight: dir := ldLeft;
end;
if dir in [ldBottom, ldLeft] then
m[dir] := Max(m[dir], dist + Marks.Distance);
end;
end;
AMargins.Top := Max(AMargins.Top, -(r.Top - rExtent.Top));
AMargins.Bottom := Max(AMargins.Bottom, (r.Bottom - rExtent.Bottom));
AMargins.Left := Max(AMargins.Left, -(r.Left - rExtent.Left));
AMargins.Right := Max(AMargins.Right, (r.Right - rExtent.Right));
end;
procedure TBasicPointSeries.UpdateMinXRange;

25
components/tachart/taseries.pas
View File

@ -63,7 +63,7 @@ type
procedure SetSeriesColor(AValue: TColor);
procedure SetZeroLevel(AValue: Double);
strict protected
function GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint; override;
function GetLabelDataPoint(AIndex: Integer): TDoublePoint; override;
function ToolTargetDistance(const AParams: TNearestPointParams;
AGraphPt: TDoublePoint; APointIdx, AXIdx, AYIdx: Integer): Integer; override;
protected
@ -1136,6 +1136,7 @@ var
Exchange(a.X, a.Y);
Exchange(b.X, b.Y);
end;
if not RectIntersectsRect(graphBar, ext2) then exit;
with imageBar do begin
@ -1176,20 +1177,20 @@ begin
heights[1] := NumberOr(p.Y, ZeroLevel);
for stackIndex := 1 to Source.YCount - 1 do begin
y := Source[pointIndex]^.YList[stackIndex - 1];
if not IsNaN(y) then
if not IsNan(y) then
heights[stackIndex + 1] := heights[stackIndex] + y;
end;
for stackIndex := 0 to High(heights) do
heights[stackindex] := AxisToGraphY(heights[stackindex]); // wp: what if rotated?
heights[stackindex] := AxisToGraphY(heights[stackindex]);
for stackIndex := 0 to Source.YCount - 1 do
BuildBar(p.X, heights[stackindex], heights[stackIndex+1]);
end else begin
for stackIndex := 0 to Source.YCount - 1 do begin
y := Source[pointIndex]^.GetY(stackIndex);
if not IsNaN(y) then
heights[stackIndex + 1] := AxisToGraphY(y)
heights[stackIndex + 1] := y
else
continue;
heights[stackIndex + 1] := 0;
end;
p.X -= w;
w := w / High(heights);
@ -1213,7 +1214,7 @@ begin
if IsEmpty then exit;
if BarWidthStyle = bwPercentMin then
UpdateMinXRange;
// UpdateMinMax(ZeroLevel, Result.a.Y, Result.b.Y);
UpdateMinMax(ZeroLevel, Result.a.Y, Result.b.Y);
// Show first and last bars fully.
i := 0;
x := NearestXNumber(i, +1); // --> x is in graph units
@ -1244,19 +1245,13 @@ begin
Result := Abs(f(2 * w) - f(0));
end;
function TBarSeries.GetLabelDataPoint(AIndex, AYIndex: Integer): TDoublePoint;
function TBarSeries.GetLabelDataPoint(AIndex: Integer): TDoublePoint;
var
ofs, w, wbar: Double;
ofs, w: Double;
begin
Result := inherited GetLabelDataPoint(AIndex, AYIndex);
Result := inherited GetLabelDataPoint(AIndex);
BarOffsetWidth(TDoublePointBoolArr(Result)[IsRotated], AIndex, ofs, w);
TDoublePointBoolArr(Result)[IsRotated] += ofs;
// Find x centers of bars in multi-y non-stacked bar series.
if (not FStacked) and (Source.YCount > 1) then begin
wbar := 2 * w / Source.YCount;
TDoublePointboolArr(Result)[IsRotated] += (wbar * (AYIndex + 0.5) - w);
end;
end;
procedure TBarSeries.GetLegendItems(AItems: TChartLegendItems);