Skip to content

FlipHorizontal, FlipVertically, CenterPaths #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

FlipHorizontal, FlipVertically, CenterPaths #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 56 additions & 3 deletions source/Img32.SVG.Reader.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ TSvgReader = class
fRootElement : TSvgElement;
fFontCache : TFontCache;
fKeepAspectRatio : Boolean;
fFlipHorizontal : Boolean;
fFlipVertical : Boolean;

function LoadInternal: Boolean;
function GetIsEmpty: Boolean;
function GetTempImage: TImage32;
Expand All @@ -188,6 +191,9 @@ TSvgReader = class
function LoadFromString(const str: string): Boolean;
function GetImageSize: TSize;

function GetPathBounds: TRectD;
function DrawFullPathsInCenter: Boolean;

// The following two methods are deprecated and intended only for ...
// https://github.com/EtheaDev/SVGIconImageList
procedure SetOverrideFillColor(color: TColor32); //deprecated;
Expand All @@ -199,9 +205,10 @@ TSvgReader = class
property IsEmpty : Boolean read GetIsEmpty;
// KeepAspectRatio: this property has also been added for the convenience of
// the third-party SVGIconImageList. (IMHO it should always = true)
property KeepAspectRatio: Boolean
read fKeepAspectRatio write fKeepAspectRatio;
property KeepAspectRatio : Boolean read fKeepAspectRatio write fKeepAspectRatio;
property RootElement : TSvgElement read fRootElement;
property FlipHorizontal : Boolean read fFlipHorizontal write fFlipHorizontal;
property FlipVertical : Boolean read fFlipVertical write fFlipVertical;
end;

var
Expand Down Expand Up @@ -5645,6 +5652,23 @@ procedure TSvgReader.ResetPaths;
end;
//------------------------------------------------------------------------------

function TSvgReader.DrawFullPathsInCenter: Boolean;
var
LRectD: TRectD;
begin
Result := false;
LRectD:= GetPathBounds;
if LRectD.IsEmpty then
Exit;

Self.RootElement.viewboxWH.Left := LRectD.Left;
Self.RootElement.viewboxWH.Top := LRectD.Top;
Self.RootElement.viewboxWH.Width := LRectD.Width;
Self.RootElement.viewboxWH.Height := LRectD.Height;
Result := true;
end;
//------------------------------------------------------------------------------

procedure TSvgReader.DrawImage(img: TImage32; scaleToImage: Boolean);
var
scale, scaleH: double;
Expand All @@ -5669,6 +5693,25 @@ procedure TSvgReader.DrawImage(img: TImage32; scaleToImage: Boolean);

MatrixTranslate(di.matrix, -viewboxWH.Left, -viewboxWH.Top);

// flips done in *viewbox space* (unit = SVG units), not with -scale
if fFlipHorizontal and fFlipVertical then
begin
MatrixScale(di.matrix, -1, -1);
MatrixTranslate(di.matrix, viewboxWH.Width, viewboxWH.Height);
end else
if fFlipHorizontal then
begin
// mirror around vertical axis of viewbox
MatrixScale(di.matrix, -1, 1);
MatrixTranslate(di.matrix, viewboxWH.Width, 0);
end else
if fFlipVertical then
begin
// mirror around horizontal axis of viewbox
MatrixScale(di.matrix, 1, -1);
MatrixTranslate(di.matrix, 0, viewboxWH.Height);
end;

//the width and height attributes generally indicate the size of the
//rendered image unless they are percentage values. Nevertheless, these
//values can be still overridden by the scaleToImage parameter above
Expand Down Expand Up @@ -5698,7 +5741,6 @@ procedure TSvgReader.DrawImage(img: TImage32; scaleToImage: Boolean);
Round(viewboxWH.Height * scaleH));
end else
img.SetSize(Round(viewboxWH.Width), Round(viewboxWH.Height));

end;

if fBkgndColor <> clNone32 then
Expand Down Expand Up @@ -5844,6 +5886,17 @@ function TSvgReader.GetIsEmpty: Boolean;
begin
Result := not Assigned(fRootElement);
end;
//------------------------------------------------------------------------------

function TSvgReader.GetPathBounds: TRectD;
begin
if not Assigned(Self.fRootElement) then begin
Result := NullRectD;
Exit;
end;
Result := Self.fRootElement.GetBounds;
end;

//------------------------------------------------------------------------------
//------------------------------------------------------------------------------

Expand Down