paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 19:35:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

TAChart: add properties "Font" and "UseFont" to TChartStyle

Browse Source 
git-svn-id: trunk@44486 -
This commit is contained in:
wp 2014-03-21 20:13:56 +00:00
parent 04d3f25da3
commit 5e9c4964ce
2 changed files with 64 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
components/tachart/tacustomseries.pas
View File

@ -965,25 +965,46 @@ var
g: TDoublePoint;
i, si: Integer;
ld: TLabelDirection;
style: TChartStyle;
lfont: TFont;
begin
if not Marks.IsMarkLabelsVisible then exit;
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 si > 0 then
if IsRotated then
g.X += AxisToGraphY(Source[i]^.YList[si - 1])
else
g.Y += AxisToGraphY(Source[i]^.YList[si - 1]);
with ParentChart do
if
(Marks.YIndex = MARKS_YINDEX_ALL) or (Marks.YIndex = si) and
IsPointInViewPort(g)
then
DrawLabel(FormattedMark(i, '', si), GraphToImage(g), ld);
lfont := TFont.Create;
try
lfont.Assign(Marks.LabelFont);
ParentChart.DisableRedrawing;
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);
if style.UseFont then
Marks.LabelFont.Assign(style.Font)
else
Marks.LabelFont.Assign(lfont);
end;
if si > 0 then
if IsRotated then
g.X += AxisToGraphY(Source[i]^.YList[si - 1])
else
g.Y += AxisToGraphY(Source[i]^.YList[si - 1]);
with ParentChart do
if
(Marks.YIndex = MARKS_YINDEX_ALL) or (Marks.YIndex = si) and
IsPointInViewPort(g)
then
DrawLabel(FormattedMark(i, '', si), GraphToImage(g), ld);
end;
end;
finally
Marks.LabelFont.Assign(lfont);
ParentChart.EnableRedrawing;
lfont.Free;
end;
end;

28
components/tachart/tastyles.pas
View File

@ -24,15 +24,19 @@ type
private
FBrush: TBrush;
FPen: TPen;
FFont: TFont;
FRepeatCount: Cardinal;
FText: String;
FUseBrush: Boolean;
FUsePen: Boolean;
FUseFont: Boolean;
procedure SetBrush(AValue: TBrush);
procedure SetFont(AValue: TFont);
procedure SetPen(AValue: TPen);
procedure SetRepeatCount(AValue: Cardinal);
procedure SetText(AValue: String);
procedure SetUseBrush(AValue: Boolean);
procedure SetUseFont(AValue: Boolean);
procedure SetUsePen(AValue: Boolean);
procedure StyleChanged(ASender: TObject);
protected
@ -45,11 +49,13 @@ type
procedure Assign(Source: TPersistent); override;
published
property Brush: TBrush read FBrush write SetBrush;
property Font: TFont read FFont write SetFont;
property Pen: TPen read FPen write SetPen;
property RepeatCount: Cardinal
read FRepeatCount write SetRepeatCount default 1;
property Text: String read FText write SetText;
property UseBrush: Boolean read FUseBrush write SetUseBrush default true;
property UseFont: Boolean read FUseFont write SetUseFont default true;
property UsePen: Boolean read FUsePen write SetUsePen default true;
end;
@ -83,12 +89,12 @@ type
FBroadcaster: TBroadcaster;
FStyles: TChartStyleList;
procedure SetStyles(AValue: TChartStyleList);
function StyleByIndex(AIndex: Cardinal): TChartStyle;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
public
procedure Apply(ADrawer: IChartDrawer; AIndex: Cardinal); overload;
function StyleByIndex(AIndex: Cardinal): TChartStyle;
property Broadcaster: TBroadcaster read FBroadcaster;
published
property Styles: TChartStyleList read FStyles write SetStyles;
@ -116,6 +122,8 @@ procedure TChartStyle.Apply(ADrawer: IChartDrawer);
begin
if UseBrush then
ADrawer.Brush := Brush;
if UseFont then
ADrawer.Font := Font;
if UsePen then
ADrawer.Pen := Pen;
end;
@ -125,6 +133,7 @@ begin
if Source is TChartStyle then
with Source as TChartStyle do begin
Self.Brush := Brush;
Self.Font := Font;
Self.Pen := Pen;
end;
inherited Assign(Source);
@ -135,16 +144,20 @@ begin
inherited Create(ACollection);
FBrush := TBrush.Create;
FBrush.OnChange := @StyleChanged;
FFont := TFont.Create;
FFont.OnChange := @StyleChanged;
FPen := TPen.Create;
FPen.OnChange := @StyleChanged;
FRepeatCount := 1;
FUseBrush := true;
FUseFont := true;
FUsePen := true;
end;
destructor TChartStyle.Destroy;
begin
FreeAndNil(FBrush);
FreeAndNil(FFont);
FreeAndNil(FPen);
inherited Destroy;
end;
@ -160,6 +173,12 @@ begin
FBrush := AValue;
end;
procedure TChartStyle.SetFont(AValue: TFont);
begin
if FFont = AValue then exit;
FFont := AValue;
end;
procedure TChartStyle.SetPen(AValue: TPen);
begin
if FPen = AValue then exit;
@ -187,6 +206,13 @@ begin
StyleChanged(Self);
end;
procedure TChartStyle.SetUseFont(AValue: Boolean);
begin
if FUseFont = AValue then exit;
FUseFont := AValue;
StyleChanged(Self);
end;
procedure TChartStyle.SetUsePen(AValue: Boolean);
begin
if FUsePen = AValue then exit;