paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2026-01-06 07:40:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: Draw minor axis marks

Browse Source 
git-svn-id: trunk@31762 -
This commit is contained in:
ask 2011-07-20 11:08:47 +00:00
parent 790e4b7ec7
commit 0138145ed5
2 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
components/tachart/tachartaxis.pas
View File

@ -33,6 +33,13 @@ const
type
TChartValueText = record
FValue: Double;
FText: String;
end;
TChartValueTextArray = array of TChartValueText;
{ TChartMinorAxis }
TChartMinorAxis = class(TChartBasicAxis)
@ -47,9 +54,11 @@ type
procedure StyleChanged(ASender: TObject); override;
public
constructor Create(ACollection: TCollection); override;
function GetMarkValues(AMin, AMax: Double): TChartValueTextArray;
published
property IntervalsCount: Cardinal
read FIntervalsCount write SetIntervalsCount default DEF_INTERVALS_COUNT;
property Marks;
property TickLength default DEF_TICK_LENGTH div 2;
end;
@ -298,6 +307,21 @@ begin
Result := 'M';
end;
function TChartMinorAxis.GetMarkValues(AMin, AMax: Double): TChartValueTextArray;
var
c, ic: Integer;
begin
if not Visible then exit(nil);
ic := IntervalsCount;
SetLength(Result, ic - 1);
for c := 1 to ic - 1 do
with Result[c - 1] do begin
FValue := WeightedAverage(AMin, AMax, c / ic);
if Marks.Visible then
FText := Format(Marks.Format, [FValue, 0.0, '', 0.0, 0.0]);
end;
end;
procedure TChartMinorAxis.SetAlignment(AValue: TChartAxisAlignment);
begin
Unused(AValue);
@ -390,10 +414,11 @@ end;
procedure TChartAxis.Draw;
var
i, j, c, ic, fixedCoord: Integer;
i, j, fixedCoord: Integer;
axisTransf: TTransformFunc;
dhMinor: TAxisDrawHelper;
pv, v: Double;
minorMarks: TChartValueTextArray;
m: TChartValueText;
begin
if not Visible then exit;
if Marks.Visible then
@ -409,17 +434,18 @@ begin
FHelper.DrawMark(fixedCoord, v, FMarkTexts[i]);
if (i = 0) or (v = pv) then continue;
for j := 0 to Minors.Count - 1 do begin
ic := Minors[j].IntervalsCount;
if not Minors[j].Visible or (ic < 2) then continue;
dhMinor := FHelper.Clone;
dhMinor.FAxis := Minors[j];
try
dhMinor.BeginDrawing;
for c := 1 to ic - 1 do
dhMinor.DrawMark(fixedCoord, WeightedAverage(pv, v, c / ic), '');
dhMinor.EndDrawing;
finally
dhMinor.Free;
minorMarks := Minors[j].GetMarkValues(pv, v);
if minorMarks = nil then continue;
with FHelper.Clone do begin
FAxis := Minors[j];
try
BeginDrawing;
for m in minorMarks do
DrawMark(fixedCoord, m.FValue, m.FText);
EndDrawing;
finally
Free;
end;
end;
end;
end;

2
components/tachart/tagraph.pas
View File

@ -702,7 +702,6 @@ end;
procedure TChart.Draw(ADrawer: IChartDrawer; const ARect: TRect);
var
c: Integer;
ldd: TChartLegendDrawingData;
s: TBasicChartSeries;
a: TChartAxis;
@ -729,7 +728,6 @@ begin
FLogicalExtent := GetFullExtent;
FCurrentExtent := FLogicalExtent;
c := (FClipRect.Left + FClipRect.Right) div 2;
with ClipRect do begin;
FTitle.Draw(ADrawer, 1, Left, Right, Top);
FFoot.Draw(ADrawer, -1, Left, Right, Bottom);