TAChart: Minor refactoring.

git-svn-id: trunk@20634 -
This commit is contained in:
ask 2009-06-15 14:08:56 +00:00
parent e8953985b2
commit a81b58fb8b
3 changed files with 8 additions and 13 deletions

View File

@ -38,6 +38,7 @@ const
clTeal, clNavy, clMaroon, clLime, clOlive, clPurple, clSilver, clAqua);
clTAColor = clScrollBar;
CHART_COMPONENT_IDE_PAGE = 'Chart';
PERCENT = 0.01;
type
EChartError = class(Exception);

View File

@ -1160,15 +1160,12 @@ procedure TChart.UpdateExtent;
procedure SetBounds(
var ALo, AHi: Double; AMin, AMax: Double; AUseMin, AUseMax: Boolean);
const
PERCENT = 0.01;
DEFAULT_WIDTH = 2.0;
var
ext: Double;
begin
if AUseMin then ALo := AMin;
if AUseMax then AHi := AMax;
case Ord(ALo = Infinity) * 2 + Ord(AHi = NegInfinity) of
0: begin // Both high and low boundary defined
case CASE_OF_TWO[ALo = Infinity, AHi = NegInfinity] of
cotNone: begin // Both high and low boundary defined
if ALo = AHi then begin
ALo -= DEFAULT_WIDTH / 2;
AHi += DEFAULT_WIDTH / 2;
@ -1176,14 +1173,12 @@ procedure TChart.UpdateExtent;
else begin
if ALo > AHi then Exchange(ALo, AHi);
// Expand view slightly to avoid data points on the chart edge.
ext := ExpandPercentage * PERCENT * Max(AHi - ALo, 1);
ALo -= ext;
AHi += ext;
ExpandRange(ALo, AHi, ExpandPercentage * PERCENT);
end;
end;
1: AHi := ALo + DEFAULT_WIDTH;
2: ALo := AHi - DEFAULT_WIDTH;
3: begin // No boundaries defined, take some arbitrary values
cotFirst: ALo := AHi - DEFAULT_WIDTH;
cotSecond: AHi := ALo + DEFAULT_WIDTH;
cotBoth: begin // No boundaries defined, take some arbitrary values
ALo := -DEFAULT_WIDTH / 2;
AHi := DEFAULT_WIDTH / 2;
end;

View File

@ -106,7 +106,6 @@ type
TBarSeries = class(TBasicPointSeries)
private
FAdjustBarWidth: Boolean;
FBarBrush: TBrush;
FBarPen: TPen;
FBarWidthPercent: Integer;
@ -947,7 +946,7 @@ begin
Abs(AX - Source[AIndex - 1]^.X),
Abs(AX - Source[AIndex + 1]^.X));
end;
Result *= FBarWidthPercent * 0.01 / 2;
Result *= FBarWidthPercent * PERCENT / 2;
end;
constructor TBarSeries.Create(AOwner: TComponent);