paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 15:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

plotpanel: Rename new background color property, introduced in previous commit, to BkColor.

Browse Source 
git-svn-id: trunk@56327 -
This commit is contained in:
wp 2017-11-06 21:39:44 +00:00
parent 8a2289c220
commit 18685acc3e
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/plotfunction/exprplotpanel.pp
View File

@ -75,7 +75,7 @@ Type
Property Active; Property Active;
Property Align; Property Align;
Property Anchors; Property Anchors;
Property BackgroundColor; Property BkColor;
Property BorderSpacing; Property BorderSpacing;
Property Color; Property Color;
Property PlotColor; Property PlotColor;

40
components/plotfunction/plotpanel.pp
View File

@ -220,7 +220,7 @@ Type
TCanvasPlotter = Class(TComponent) TCanvasPlotter = Class(TComponent)
private private
FActive: Boolean; FActive: Boolean;
FBackGroundColor: TColor; FBkColor: TColor;
FBoundsRect: TRect; FBoundsRect: TRect;
FCaption: TPlotCaption; FCaption: TPlotCaption;
FColor: TColor; FColor: TColor;
@ -234,7 +234,7 @@ Type
FLastFont : TFont; FLastFont : TFont;
procedure DrawCaption(ACanvas: TCanvas); procedure DrawCaption(ACanvas: TCanvas);
procedure SetActive(const AValue: Boolean); procedure SetActive(const AValue: Boolean);
procedure SetBackGroundColor(const AValue: TColor); procedure SetBkColor(const AValue: TColor);
procedure SetBoundsRect(const AValue: TRect); procedure SetBoundsRect(const AValue: TRect);
procedure SetCanvas(const AValue: TCanvas); procedure SetCanvas(const AValue: TCanvas);
procedure SetCaption(const AValue: TPlotCaption); procedure SetCaption(const AValue: TPlotCaption);
@ -261,7 +261,7 @@ Type
Property Canvas : TCanvas Read FCanvas Write SetCanvas; Property Canvas : TCanvas Read FCanvas Write SetCanvas;
Property XAxis : TPlotXAxis Read FXaxis Write SetXAxis; Property XAxis : TPlotXAxis Read FXaxis Write SetXAxis;
Property YAxis : TPlotYAxis Read FYaxis Write SetYAxis; Property YAxis : TPlotYAxis Read FYaxis Write SetYAxis;
Property BackgroundColor : TColor Read FBackGroundColor Write SetBackGroundColor; Property BkColor : TColor Read FBkColor Write SetBkColor;
Property Color: TColor Read FColor write SetColor; Property Color: TColor Read FColor write SetColor;
Property PlotColor : TColor Read FPlotColor Write SetPlotColor; Property PlotColor : TColor Read FPlotColor Write SetPlotColor;
Property PlotLinewidth: Integer read FPlotLineWidth Write SetPlotLineWidth; Property PlotLinewidth: Integer read FPlotLineWidth Write SetPlotLineWidth;
@ -298,7 +298,7 @@ Type
private private
FPlotter: TCanvasPlotter; FPlotter: TCanvasPlotter;
function GetActive: Boolean; function GetActive: Boolean;
function GetBackgroundColor: TColor; function GetBkColor: TColor;
function GetCaption: TPlotCaption; function GetCaption: TPlotCaption;
function GetColor: TColor; function GetColor: TColor;
function GetPlotColor: TColor; function GetPlotColor: TColor;
@ -306,7 +306,7 @@ Type
function GetXaxis: TPlotXAxis; function GetXaxis: TPlotXAxis;
function GetYaxis: TPlotYAxis; function GetYaxis: TPlotYAxis;
procedure SetActive(const AValue: Boolean); procedure SetActive(const AValue: Boolean);
procedure SetBackgroundColor(const AValue: TColor); procedure SetBkColor(const AValue: TColor);
procedure SetCaption(const AValue: TPlotCaption); procedure SetCaption(const AValue: TPlotCaption);
procedure SetPlotColor(const AValue: TColor); procedure SetPlotColor(const AValue: TColor);
procedure SetPlotLineWidth(const AValue: Integer); procedure SetPlotLineWidth(const AValue: Integer);
@ -322,7 +322,7 @@ Type
Destructor Destroy; override; Destructor Destroy; override;
Property Align; Property Align;
Property Active : Boolean Read GetActive Write SetActive; Property Active : Boolean Read GetActive Write SetActive;
Property BackgroundColor: TColor read GetBackgroundColor write SetBackgroundColor default clDefault; Property BkColor: TColor read GetBkColor write SetBkColor default clDefault;
Property Caption : TPlotCaption Read GetCaption Write SetCaption; Property Caption : TPlotCaption Read GetCaption Write SetCaption;
Property Color: TColor read GetColor write SetColor default clDefault; Property Color: TColor read GetColor write SetColor default clDefault;
Property PlotColor : TColor Read GetPlotColor Write SetPlotColor; Property PlotColor : TColor Read GetPlotColor Write SetPlotColor;
@ -344,7 +344,7 @@ Type
Property Align; Property Align;
Property Anchors; Property Anchors;
Property Active; Property Active;
Property BackgroundColor; Property BkColor;
Property BorderSpacing; Property BorderSpacing;
Property Color; Property Color;
Property PlotColor; Property PlotColor;
@ -383,9 +383,9 @@ begin
Result:=FPlotter.Active; Result:=FPlotter.Active;
end; end;
function TCustomPlotFunctionPanel.GetBackgroundColor: TColor; function TCustomPlotFunctionPanel.GetBkColor: TColor;
begin begin
Result := FPlotter.BackgroundColor; Result := FPlotter.BkColor;
end; end;
function TCustomPlotFunctionPanel.GetCaption: TPlotCaption; function TCustomPlotFunctionPanel.GetCaption: TPlotCaption;
@ -423,9 +423,9 @@ begin
FPlotter.Active:=AValue; FPlotter.Active:=AValue;
end; end;
procedure TCustomPlotFunctionPanel.SetBackgroundColor(const AValue: TColor); procedure TCustomPlotFunctionPanel.SetBkColor(const AValue: TColor);
begin begin
FPlotter.BackgroundColor := AValue; FPlotter.BkColor := AValue;
end; end;
procedure TCustomPlotFunctionPanel.SetCaption(const AValue: TPlotCaption); procedure TCustomPlotFunctionPanel.SetCaption(const AValue: TPlotCaption);
@ -759,10 +759,10 @@ begin
Changed; Changed;
end; end;
procedure TCanvasPlotter.SetBackGroundColor(const AValue: TColor); procedure TCanvasPlotter.SetBkColor(const AValue: TColor);
begin begin
if FBackGroundColor=AValue then exit; if FBkColor=AValue then exit;
FBackGroundColor:=AValue; FBkColor:=AValue;
Changed; Changed;
end; end;
@ -847,7 +847,7 @@ begin
FPlotColor:=DefPlotColor; FPlotColor:=DefPlotColor;
FPlotLinewidth:=DefLinewidth; FPlotLinewidth:=DefLinewidth;
FCaption:=TPlotCaption.Create; FCaption:=TPlotCaption.Create;
FBackgroundColor := clDefault; FBkColor := clDefault;
FColor := clDefault; FColor := clDefault;
end; end;
@ -898,8 +898,8 @@ begin
ACanvas.Brush.Style:=bsSolid; ACanvas.Brush.Style:=bsSolid;
ACanvas.FillRect(BoundsRect); ACanvas.FillRect(BoundsRect);
// Background color paints the background spanned by the axes // BkColor paints the background spanned by the axes
ACanvas.Brush.Color := BackgroundColor; ACanvas.Brush.Color := BkColor;
ACanvas.FillRect( ACanvas.FillRect(
FXAxis.LeftMargin, FXAxis.LeftMargin,
FYAxis.TopMargin, FYAxis.TopMargin,
@ -1119,7 +1119,7 @@ begin
CW:=BMP.Canvas.TextWidth(L); CW:=BMP.Canvas.TextWidth(L);
BMP.Width:=CW; BMP.Width:=CW;
BMP.Height:=CH; BMP.Height:=CH;
BMP.Canvas.Brush.Color:=Self.BackgroundColor; BMP.Canvas.Brush.Color:=Self.Color;
BMP.Canvas.Brush.Style:=bsSolid; BMP.Canvas.Brush.Style:=bsSolid;
BMP.Canvas.FillRect(0,0,CW,CH); BMP.Canvas.FillRect(0,0,CW,CH);
BMP.Canvas.TextOut(0,0,L); BMP.Canvas.TextOut(0,0,L);
@ -1241,8 +1241,8 @@ begin
FControl:=AOwner as TControl; FControl:=AOwner as TControl;
if FColor = clDefault then if FColor = clDefault then
FColor := FControl.Color; FColor := FControl.Color;
if FBackgroundColor = clDefault then if FBkColor = clDefault then
FBackGroundColor:=FControl.Color; FBkColor := FControl.Color;
end; end;
end; end;