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

LCL: Make procedure RotateRect() (local to customlabel.inc) publicly available in GraphMath.

Browse Source
This commit is contained in:
wp_xyz 2022-03-13 15:41:48 +01:00
parent 2fd847364e
commit 201075cbd8
3 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/lazutils/graphmath.pp
View File

@ -90,6 +90,9 @@ function Quadrant(const PT, Center : TPoint) : Integer;
function RadialPoint(EccentricAngle : Extended; const Rect : TRect) : TPoint;
function RotatePoint(const APoint: TPoint; AAngle: Double): TPoint;
function RotateRect(AWidth, AHeight: Integer; AAngle: Double): TRect;
procedure SplitBezier(const Bezier : TBezier; var Left, Right : TBezier);
Operator + (const Addend1, Addend2 : TFloatPoint) : TFloatPoint; inline;
@ -1022,6 +1025,62 @@ Begin
Result := LineEndPoint(CenterPoint(Rect), EccentricAngle, R);
end;
{-------------------------------------------------------------------------------
Method: RotatePoint
Params: APoint, AAngle
Returns: TPoint after rotation
Rotates a point around the origin (0,0) by the angle AAngle. The angle is
in radians and positive for counter-clockwise rotation.
Note that y points downwards.
-------------------------------------------------------------------------------}
function RotatePoint(const APoint: TPoint; AAngle: Double): TPoint;
var
sa, ca: Double;
begin
sa := sin(AAngle);
ca := cos(AAngle);
Result.X := Round( ca * APoint.X + sa * APoint.Y);
Result.Y := Round(-sa * APoint.X + ca * APoint.Y);
end;
procedure GetMinMax(x: Integer; var min, max: Integer);
begin
if x < min then min := x;
if x > max then max := x;
end;
{-------------------------------------------------------------------------------
Method: RotateRect
Params: AWidth, AHeight, AAngle
Returns: smallest TRect containing the rotated rectangle.
Rotates the rectangle (0, 0, AWidth, AHeight) around its top-left corner (0,0)
by the angle AAngle (in radians).
Note that y points downwards.
-------------------------------------------------------------------------------}
function RotateRect(AWidth, AHeight: Integer; AAngle: Double): TRect;
var
P1, P2, P3: TPoint;
begin
if AAngle = 0 then
Result := Rect(0, 0, AWidth, AHeight)
else
begin
P1 := RotatePoint(Point(AWidth, 0), AAngle);
P2 := RotatePoint(Point(0, AHeight), AAngle);
P3 := P1 + P2;
Result := Rect(0, 0, 0, 0);
GetMinMax(P1.X, Result.Left, Result.Right);
GetMinMax(P2.X, Result.Left, Result.Right);
GetMinMax(P3.X, Result.Left, Result.Right);
GetMinMax(P1.Y, Result.Top, Result.Bottom);
GetMinMax(P2.Y, Result.Top, Result.Bottom);
GetMinMax(P3.Y, Result.Top, Result.Bottom);
end;
end;
{------------------------------------------------------------------------------
Method: SplitBezier
Params: Bezier, Left, Right

39
lcl/include/customlabel.inc
View File

@ -24,45 +24,6 @@
const
cMaxLabelSize = 10000;
// AAngle is in radians, counter-clockwise = positive. But: y points down!
function RotatePoint(const APoint: TPoint; AAngle: Double): TPoint;
var
sa, ca: Double;
begin
sa := sin(AAngle);
ca := cos(AAngle);
Result.X := Round( ca * APoint.X + sa * APoint.Y);
Result.Y := Round(-sa * APoint.X + ca * APoint.Y);
end;
procedure GetMinMax(x: Integer; var min, max: Integer);
begin
if x < min then min := x;
if x > max then max := x;
end;
function RotateRect(AWidth, AHeight: Integer; AAngle: Double): TRect;
var
P1, P2, P3: TPoint;
begin
if AAngle = 0 then
Result := Rect(0, 0, AWidth, AHeight)
else
begin
P1 := RotatePoint(Point(AWidth, 0), AAngle);
P2 := RotatePoint(Point(0, AHeight), AAngle);
P3 := Point(P1.X+P2.X, P1.Y+P2.Y);
Result := Rect(0, 0, 0, 0);
GetMinMax(P1.X, Result.Left, Result.Right);
GetMinMax(P2.X, Result.Left, Result.Right);
GetMinMax(P3.X, Result.Left, Result.Right);
GetMinMax(P1.Y, Result.Top, Result.Bottom);
GetMinMax(P2.Y, Result.Top, Result.Bottom);
GetMinMax(P3.Y, Result.Top, Result.Bottom);
end;
end;
procedure TCustomLabel.CalculatePreferredSize(
var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean);
// assumes: (Parent <> nil) and Parent.HandleAllocated

3
lcl/stdctrls.pp
View File

@ -1676,7 +1676,8 @@ procedure Register;
implementation
uses
WSControls, WSStdCtrls, interfacebase; // Widgetset uses circle is allowed
WSControls, WSStdCtrls, interfacebase, // Widgetset uses circle is allowed
Graphmath;
type