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

TAChart: Add Axis.Title.Distance property. Minor refactoring.

Browse Source 
git-svn-id: trunk@20404 -
This commit is contained in:
ask 2009-06-04 15:58:58 +00:00
parent b13a1bbcb0
commit 05136fc2e5
4 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/tachart/tachartutils.pas
View File

@ -56,6 +56,8 @@ type
);
end;
TChartDistance = 0..MaxInt;
TPointDistFunc = function (const A, B: TPoint): Integer;
TAxisScale = (asIncreasing, asDecreasing, asLogIncreasing, asLogDecreasing);

22
components/tachart/tagraph.pas
View File

@ -44,18 +44,16 @@ type
ASender: TChart; ASeriesIndex, AIndex: Integer;
const AImg: TPoint; const AData: TDoublePoint) of object;
TChartZPosition = 0..MaxInt;
{ TBasicChartSeries }
TBasicChartSeries = class(TComponent)
protected
FActive: Boolean;
FChart: TChart;
FDepth: TChartZPosition;
FDepth: TChartDistance;
FShowInLegend: Boolean;
FTitle: String;
FZPosition: TChartZPosition;
FZPosition: TChartDistance;
procedure AfterAdd; virtual;
procedure AfterDraw; virtual;
@ -69,10 +67,10 @@ type
virtual;
function GetSeriesColor: TColor; virtual; abstract;
procedure SetActive(AValue: Boolean); virtual; abstract;
procedure SetDepth(AValue: TChartZPosition); virtual; abstract;
procedure SetDepth(AValue: TChartDistance); virtual; abstract;
procedure SetSeriesColor(const AValue: TColor); virtual; abstract;
procedure SetShowInLegend(AValue: Boolean); virtual; abstract;
procedure SetZPosition(AValue: TChartZPosition); virtual; abstract;
procedure SetZPosition(AValue: TChartDistance); virtual; abstract;
procedure UpdateBounds(var ABounds: TDoubleRect); virtual; abstract;
procedure UpdateMargins(ACanvas: TCanvas; var AMargins: TRect); virtual;
@ -91,14 +89,14 @@ type
function IsEmpty: Boolean; virtual; abstract;
property Active: Boolean read FActive write SetActive;
property Depth: TChartZPosition read FDepth write SetDepth default 0;
property Depth: TChartDistance read FDepth write SetDepth default 0;
property ParentChart: TChart read FChart;
property SeriesColor: TColor
read GetSeriesColor write SetSeriesColor default clTAColor;
property ShowInLegend: Boolean
read FShowInLegend write SetShowInLegend default true;
property Title: String read FTitle write FTitle;
property ZPosition: TChartZPosition read FZPosition write SetZPosition default 0;
property ZPosition: TChartDistance read FZPosition write SetZPosition default 0;
end;
TSeriesClass = class of TBasicChartSeries;
@ -126,7 +124,7 @@ type
FAxisColor: TColor;
FAxisVisible: Boolean;
FBackColor: TColor;
FDepth: TChartZPosition;
FDepth: TChartDistance;
FExpandPercentage: Integer;
FExtent: TChartExtent;
FFoot: TChartTitle;
@ -166,7 +164,7 @@ type
procedure SetAxisList(AValue: TChartAxisList);
procedure SetAxisVisible(Value: Boolean);
procedure SetBackColor(const AValue: TColor);
procedure SetDepth(AValue: TChartZPosition);
procedure SetDepth(AValue: TChartDistance);
procedure SetExpandPercentage(AValue: Integer);
procedure SetExtent(const AValue: TChartExtent);
procedure SetFoot(Value: TChartTitle);
@ -249,7 +247,7 @@ type
property AxisVisible: Boolean read FAxisVisible write SetAxisVisible default true;
property BackColor: TColor read FBackColor write SetBackColor default clBtnFace;
property BottomAxis: TChartAxis index 1 read GetAxis write SetAxis stored false;
property Depth: TChartZPosition read FDepth write SetDepth default 0;
property Depth: TChartDistance read FDepth write SetDepth default 0;
property ExpandPercentage: Integer
read FExpandPercentage write SetExpandPercentage default 0;
property Extent: TChartExtent read FExtent write SetExtent;
@ -1082,7 +1080,7 @@ begin
Series.FList.Move(i, Order);
end;
procedure TChart.SetDepth(AValue: TChartZPosition);
procedure TChart.SetDepth(AValue: TChartDistance);
begin
if FDepth = AValue then exit;
FDepth := AValue;

16
components/tachart/taseries.pas
View File

@ -59,9 +59,9 @@ type
function GetLegendCount: Integer; override;
function GetLegendWidth(ACanvas: TCanvas): Integer; override;
procedure SetActive(AValue: Boolean); override;
procedure SetDepth(AValue: TChartZPosition); override;
procedure SetDepth(AValue: TChartDistance); override;
procedure SetShowInLegend(AValue: Boolean); override;
procedure SetZPosition(AValue: TChartZPosition); override;
procedure SetZPosition(AValue: TChartDistance); override;
procedure StyleChanged(Sender: TObject);
procedure UpdateBounds(var ABounds: TDoubleRect); override;
procedure UpdateParentChart;
@ -317,10 +317,10 @@ type
function GetLegendWidth(ACanvas: TCanvas): Integer; override;
function GetSeriesColor: TColor; override;
procedure SetActive(AValue: Boolean); override;
procedure SetDepth(AValue: TChartZPosition); override;
procedure SetDepth(AValue: TChartDistance); override;
procedure SetSeriesColor(const AValue: TColor); override;
procedure SetShowInLegend(AValue: Boolean); override;
procedure SetZPosition(AValue: TChartZPosition); override;
procedure SetZPosition(AValue: TChartDistance); override;
procedure StyleChanged(Sender: TObject);
procedure UpdateBounds(var ABounds: TDoubleRect); override;
procedure UpdateParentChart;
@ -538,7 +538,7 @@ begin
UpdateParentChart;
end;
procedure TChartSeries.SetDepth(AValue: TChartZPosition);
procedure TChartSeries.SetDepth(AValue: TChartDistance);
begin
if FDepth = AValue then exit;
FDepth := AValue;
@ -568,7 +568,7 @@ begin
UpdateParentChart;
end;
procedure TChartSeries.SetZPosition(AValue: TChartZPosition);
procedure TChartSeries.SetZPosition(AValue: TChartDistance);
begin
if FZPosition = AValue then exit;
FZPosition := AValue;
@ -1541,7 +1541,7 @@ begin
UpdateParentChart;
end;
procedure TFuncSeries.SetDepth(AValue: TChartZPosition);
procedure TFuncSeries.SetDepth(AValue: TChartDistance);
begin
if FDepth = AValue then exit;
FDepth := AValue;
@ -1590,7 +1590,7 @@ begin
UpdateParentChart;
end;
procedure TFuncSeries.SetZPosition(AValue: TChartZPosition);
procedure TFuncSeries.SetZPosition(AValue: TChartDistance);
begin
if FZPosition = AValue then exit;
FZPosition := AValue;

57
components/tachart/tatypes.pas
View File

@ -35,6 +35,10 @@ const
MARKS_MARGIN_X = 4;
MARKS_MARGIN_Y = 2;
DEF_MARGIN = 4;
DEF_MARKS_DISTANCE = 20;
DEF_POINTER_SIZE = 4;
DEF_TICK_LENGTH = 4;
DEF_TITLE_DISTANCE = 4;
type
TCustomChart = class(TCustomControl);
@ -126,12 +130,16 @@ type
property Visible default false;
end;
{ TChartAxisTitle }
TChartAxisTitle = class(TChartElement)
private
FCaption: String;
FDistance: TChartDistance;
FFont: TFont;
procedure SetCaption(AValue: String);
procedure SetDistance(AValue: TChartDistance);
procedure SetFont(AValue: TFont);
public
constructor Create(AOwner: TCustomChart);
@ -140,6 +148,8 @@ type
procedure Assign(Source: TPersistent); override;
published
property Caption: String read FCaption write SetCaption;
property Distance: TChartDistance
read FDistance write SetDistance default DEF_TITLE_DISTANCE;
property Font: TFont read FFont write SetFont;
property Visible default false;
end;
@ -204,7 +214,8 @@ type
// Inverts the axis scale from increasing to decreasing.
property Inverted: boolean read FInverted write SetInverted default false;
property TickColor: TColor read FTickColor write SetTickColor default clBlack;
property TickLength: Integer read FTickLength write SetTickLength default 4;
property TickLength: Integer
read FTickLength write SetTickLength default DEF_TICK_LENGTH;
property Title: TChartAxisTitle read FTitle write SetTitle;
property Visible: Boolean read FVisible write SetVisible default true;
end;
@ -268,7 +279,8 @@ type
function IsMarkLabelsVisible: Boolean;
published
// Distance between series point and label.
property Distance: Integer read FDistance write SetDistance default 20;
property Distance: Integer
read FDistance write SetDistance default DEF_MARKS_DISTANCE;
property Format: String read FFormat write SetFormat;
property Frame: TChartPen read FFrame write SetFrame;
property LabelBrush: TChartLabelBrush read FLabelBrush write SetLabelBrush;
@ -302,10 +314,10 @@ type
procedure Draw(ACanvas: TCanvas; ACenter: TPoint; AColor: TColor);
published
property Brush: TBrush read FBrush write SetBrush;
property HorizSize: Integer read FHorizSize write SetHorizSize default 4;
property HorizSize: Integer read FHorizSize write SetHorizSize default DEF_POINTER_SIZE;
property Pen: TChartPen read FPen write SetPen;
property Style: TSeriesPointerStyle read FStyle write SetStyle default psRectangle;
property VertSize: Integer read FVertSize write SetVertSize default 4;
property VertSize: Integer read FVertSize write SetVertSize default DEF_POINTER_SIZE;
property Visible default true;
end;
@ -337,8 +349,6 @@ type
property UseYMax: Boolean index 4 read GetUseBounds write SetUseBounds default false;
end;
TChartMargin = 0..MaxInt;
{ TChartMargins }
TChartMargins = class (TChartElement)
@ -349,17 +359,17 @@ type
1: (FCoords: array [1..4] of Integer;);
end;
function GetValue(AIndex: Integer): integer;
procedure SetValue(AIndex: integer; AValue: TChartMargin);
procedure SetValue(AIndex: integer; AValue: TChartDistance);
public
constructor Create(AOwner: TCustomChart);
public
procedure Assign(Source: TPersistent); override;
property Data: TRect read FData.FRect;
published
property Left: TChartMargin index 1 read GetValue write SetValue default DEF_MARGIN;
property Top: TChartMargin index 2 read GetValue write SetValue default DEF_MARGIN;
property Right: TChartMargin index 3 read GetValue write SetValue default DEF_MARGIN;
property Bottom: TChartMargin index 4 read GetValue write SetValue default DEF_MARGIN;
property Left: TChartDistance index 1 read GetValue write SetValue default DEF_MARGIN;
property Top: TChartDistance index 2 read GetValue write SetValue default DEF_MARGIN;
property Right: TChartDistance index 3 read GetValue write SetValue default DEF_MARGIN;
property Bottom: TChartDistance index 4 read GetValue write SetValue default DEF_MARGIN;
end;
function SideByAlignment(
@ -371,7 +381,6 @@ uses
Math, Types;
const
CAPTION_DIST = 4;
FONT_SLOPE_VERTICAL = 45 * 10;
function MarkToText(AMark: Double): String;
@ -588,6 +597,7 @@ end;
constructor TChartAxisTitle.Create(AOwner: TCustomChart);
begin
inherited Create(AOwner);
FDistance := DEF_TITLE_DISTANCE;
InitHelper(FFont, TFont);
end;
@ -603,6 +613,13 @@ begin
StyleChanged(Self);
end;
procedure TChartAxisTitle.SetDistance(AValue: TChartDistance);
begin
if FDistance = AValue then exit;
FDistance := AValue;
StyleChanged(Self);
end;
procedure TChartAxisTitle.SetFont(AValue: TFont);
begin
FFont.Assign(AValue);
@ -629,7 +646,7 @@ begin
FGrid.OnChange := @StyleChanged;
FGrid.Style := psDot;
FTickColor := clBlack;
FTickLength := 4;
FTickLength := DEF_TICK_LENGTH;
FTitle := TChartAxisTitle.Create(ACollection.Owner as TCustomChart);
FVisible := true;
end;
@ -754,8 +771,8 @@ begin
case Alignment of
calLeft: p.X := ARect.Left - FTitleSize;
calTop: p.Y := ARect.Top - FTitleSize;
calRight: p.X := ARect.Right + CAPTION_DIST;
calBottom: p.Y := ARect.Bottom + CAPTION_DIST;
calRight: p.X := ARect.Right + Title.Distance;
calBottom: p.Y := ARect.Bottom + Title.Distance;
end;
ACanvas.TextOut(p.X, p.Y, Title.Caption);
finally
@ -828,7 +845,7 @@ procedure TChartAxis.Measure(
d := sz.cx
else
d := sz.cy;
FTitleSize := d + CAPTION_DIST;
FTitleSize := d + Title.Distance;
end;
begin
@ -915,7 +932,7 @@ end;
constructor TChartMarks.Create(AOwner: TCustomChart);
begin
inherited Create(AOwner);
FDistance := 20;
FDistance := DEF_MARKS_DISTANCE;
InitHelper(FFrame, TChartPen);
InitHelper(FLabelBrush, TChartLabelBrush);
FLabelBrush.Color := clYellow;
@ -1025,9 +1042,9 @@ begin
InitHelper(FBrush, TBrush);
InitHelper(FPen, TChartPen);
FHorizSize := 4;
FHorizSize := DEF_POINTER_SIZE;
FStyle := psRectangle;
FVertSize := 4;
FVertSize := DEF_POINTER_SIZE;
FVisible := true;
end;
@ -1192,7 +1209,7 @@ begin
Result := FData.FCoords[AIndex];
end;
procedure TChartMargins.SetValue(AIndex: integer; AValue: TChartMargin);
procedure TChartMargins.SetValue(AIndex: integer; AValue: TChartDistance);
begin
if FData.FCoords[AIndex] = AValue then exit;
FData.FCoords[AIndex] := AValue;